From ead60ed08a3928d50c3a38cc6f80ccafd3986a6e Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Jul 31 2014 16:17:33 +0000
Subject: Updated translations


---

diff --git a/po/ach.po b/po/ach.po
index a230d1e..0a11649 100644
--- a/po/ach.po
+++ b/po/ach.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Acoli (http://www.transifex.com/projects/p/certmonger/language/ach/)\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/certmonger/"
+"language/ach/)\n"
+"Language: ach\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/af.po b/po/af.po
index 137a46f..e46c377 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Afrikaans (http://www.transifex.com/projects/p/certmonger/language/af/)\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/certmonger/"
+"language/af/)\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/af_ZA.po b/po/af_ZA.po
index 0150a2c..b86b672 100644
--- a/po/af_ZA.po
+++ b/po/af_ZA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/aln.po b/po/aln.po
index 07e44d7..df9a966 100644
--- a/po/aln.po
+++ b/po/aln.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Albanian Gheg (http://www.transifex.com/projects/p/certmonger/language/aln/)\n"
+"Language-Team: Albanian Gheg (http://www.transifex.com/projects/p/certmonger/"
+"language/aln/)\n"
+"Language: aln\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: aln\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/am.po b/po/am.po
index 32e97be..6934cb6 100644
--- a/po/am.po
+++ b/po/am.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Amharic (http://www.transifex.com/projects/p/certmonger/language/am/)\n"
+"Language-Team: Amharic (http://www.transifex.com/projects/p/certmonger/"
+"language/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 6929cd8..578d3ca 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/certmonger/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/certmonger/"
+"language/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/as.po b/po/as.po
index b5d6161..3b90ff5 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Assamese (http://www.transifex.com/projects/p/certmonger/language/as/)\n"
+"Language-Team: Assamese (http://www.transifex.com/projects/p/certmonger/"
+"language/as/)\n"
+"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 86758e5..8c9c636 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Asturian (http://www.transifex.com/projects/p/certmonger/language/ast/)\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/certmonger/"
+"language/ast/)\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/az.po b/po/az.po
index 0c7cc97..a92549b 100644
--- a/po/az.po
+++ b/po/az.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/certmonger/language/az/)\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/certmonger/"
+"language/az/)\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bal.po b/po/bal.po
index 21ac85d..a6c4f58 100644
--- a/po/bal.po
+++ b/po/bal.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Balochi (http://www.transifex.com/projects/p/certmonger/language/bal/)\n"
+"Language-Team: Balochi (http://www.transifex.com/projects/p/certmonger/"
+"language/bal/)\n"
+"Language: bal\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bal\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/be.po b/po/be.po
index 567161a..6ffdb8b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/certmonger/language/be/)\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/certmonger/"
+"language/be/)\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 4871c92..29a0e96 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Boris Yakimov <borisyakimov@ymail.com>, 2012
 # Valentin Laskov <laskov@festa.bg>, 2011-2013
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/certmonger/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/certmonger/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -37,8 +38,8 @@ msgstr "Грешка при подготовка за XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Грешка при анализ отговора от сървъра.\n"
@@ -103,7 +104,9 @@ msgstr "Пътят \"%s\" не е абсолютен, вместо него, п�
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Пътят \"%s\" не е абсолютен и се получи грешка при определяне името на текущата директория.\n"
+msgstr ""
+"Пътят \"%s\" не е абсолютен и се получи грешка при определяне името на "
+"текущата директория.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -170,7 +173,7 @@ msgstr "Получен е отговор за грешка от локална %
 msgid "No response received from %s service.\n"
 msgstr "Не е получен отговор от услугата %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +214,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Грешка при сглобяването на главното име на Kerberos \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: грешна опция -- '%c'⏎\n"
@@ -225,10 +228,12 @@ msgstr "%s: грешна опция -- '%c'⏎\n"
 #: src/getcert.c:800
 #, c-format
 msgid "Error: unused extra argument \"%s\".\n"
-msgstr "Грешка: неизползван допълнителен аргумент \"%s\".⏎\n\n"
+msgstr ""
+"Грешка: неизползван допълнителен аргумент \"%s\".⏎\n"
+"\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Грешка: бяха предоставени неизползвани допълнителни аргументи.\n"
@@ -236,7 +241,8 @@ msgstr "Грешка: бяха предоставени неизползвани
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
 msgid "Database location or nickname specified without the other.\n"
-msgstr "Местоположение на базата данни или псевдоним е определено без другото.\n"
+msgstr ""
+"Местоположение на базата данни или псевдоним е определено без другото.\n"
 
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
@@ -245,23 +251,29 @@ msgstr "Определени са и директория на базата да
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Никое от директория на базата данни и псевдоним, или файл със сертификат не е определено.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Никое от директория на базата данни и псевдоним, или файл със сертификат не "
+"е определено.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "Не може и ключът, и сертификатът, да бъдат записани в един и същ файл.\n"
+msgstr ""
+"Не може и ключът, и сертификатът, да бъдат записани в един и същ файл.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Задният слой на IPA изисква използването на -K опция (главно име), когато -N опцията (име на обекта) се използва.⏎\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Задният слой на IPA изисква използването на -K опция (главно име), когато -N "
+"опцията (име на обекта) се използва.⏎\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Не е намерен CA с име \"%s\".\n"
@@ -297,7 +309,9 @@ msgstr "Не може да бъде добавена нова проследяв
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Никое от ID, или директория на базата данни и псевдоним, или файл със сертификат не е определено.\n"
+msgstr ""
+"Никое от ID, или директория на базата данни и псевдоним, или файл със "
+"сертификат не е определено.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -309,12 +323,12 @@ msgstr "Беше променена заявката \"%s\".\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Не можа да бъде променена заявката \"%s\".\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Не е намерено искане за този псевдоним.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Не беше намерена заявка, отговаряща на аргументите.\n"
@@ -354,605 +368,633 @@ msgstr "Грешка при опит за изпращане на \"%s\" към 
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Грешка при опит за изпращане на \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Брой на проследяваните сертификати и заявки: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID на заявка '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "        състояние: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "        CA-грешка: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "        останал: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "        хранилище на ключови двойки: тип=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "НИЩО"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",местоположение='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",псевдоним='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",пин='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",пинфайл='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "        сертификат: тип=%s,местоположение='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "        CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "        издател: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "        обект: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "        изтича на: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "непознат"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\temail: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "»главно име: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tkey usage: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tpre-save команда: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tpost-save команда: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttrack: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-renew: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-type: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\thelper-location: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "»следващ-сериен-номер: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "        познати-имена-на-издатели:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - инструмент за записване на клиентски сертификат\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Употреба: %s request [опции]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Необходими аргументи:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Ако за хранилище се използва NSS база данни:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR         NSS база данни за ключ и сертификат\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAME        псевдоним за NSS-базирано хранилище (валидно само с -d)\n"
+msgstr ""
+"  -n NAME        псевдоним за NSS-базирано хранилище (валидно само с -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAME        незадължително token name за NSS-базирано хранилище (валидно само с -d)\n"
+msgstr ""
+"  -t NAME        незадължително token name за NSS-базирано хранилище "
+"(валидно само с -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Ако за хранилище се използват файлове:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE        PEM файл за частен ключ\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE        PEM файл за сертификат (валидно само с -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Ако ключовете трябва да бъдат криптирани:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE        файл, съдържащ ПИН за криптиране\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN        стойност на ПИН\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Незадължителни аргументи:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Настройки на обработката на сертификата:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME        псевдоним, който да бъде присвоен към заявката\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g SIZE»големина на ключ, който да бъде генериран ако няма вече създаден такъв⏎\n"
+msgstr ""
+"  -g SIZE»големина на ключ, който да бъде генериран ако няма вече създаден "
+"такъв⏎\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r             опит за подновяване на сертификата, когато изтичането му наближава (по подразбиране)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r             опит за подновяване на сертификата, когато изтичането му "
+"наближава (по подразбиране)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R             не опитвай подновяване на сертификата, когато изтичането му наближава\n"
+msgstr ""
+"  -R             не опитвай подновяване на сертификата, когато изтичането му "
+"наближава\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA          използвай зададения CA вместо този по подразбиране\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\tиска CA да обработи заявката, използвайки профил или шаблон с това име\n"
+msgstr ""
+"  -T PROFILE\tиска CA да обработи заявката, използвайки профил или шаблон с "
+"това име\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Параметри за подписване на заявките:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME        задава заявеното име на обекта (по подразбиране: CN=<име на хост>)\n"
+msgstr ""
+"  -N NAME        задава заявеното име на обекта (по подразбиране: CN=<име на "
+"хост>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\tзадава искан разширен OID ключ за употреба\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\tзадава исканата key usage стойност\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME\tзадава искано principal име\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAME\tзадава искано DNS име\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL     задава заявения имейл адрес\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Опции на шината:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
-msgstr "  -S                свържи се с услугата certmonger през системната шина\n"
+msgstr ""
+"  -S                свържи се с услугата certmonger през системната шина\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s                свържи се с услугата certmonger през сесийната шина\n"
+msgstr ""
+"  -s                свържи се с услугата certmonger през сесийната шина\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Други опции:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tкоманда за изпълнение преди записа на сертификата\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tкоманда за изпълнение след записа на сертификата\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v        показва всички подробности за грешките\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Употреба: %s start-tracking [опции]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Ако се променя съществуваща заявка:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME        псевдоним от съществуваща проследявана заявка\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Ако ключовете са криптирани:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
-msgstr "  -I NAME        псевдоним, който да бъде даден към проследяваната заявка\n"
+msgstr ""
+"  -I NAME        псевдоним, който да бъде даден към проследяваната заявка\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Параметри за заявката за подписване по време на подновяването:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\tзамества искания разширен OID ключ за употреба\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME\tзамества исканото principal име\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\tзамества исканото DNS име\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "-E EMAIL»смяна на искания email адрес\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Употреба: %s stop-tracking [опции]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* По идентификатор на заявката:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME        псевдоним за проследяваната заявка\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Употреба: %s resubmit [опции]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE        PEM файл за сертификата\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Нови стойности на параметри за подписваната заявка:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
-msgstr "  -I NAME        нов псевдоним, който да бъде даден към проследяваната заявка\n"
+msgstr ""
+"  -I NAME        нов псевдоним, който да бъде даден към проследяваната "
+"заявка\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA                използвай зададения CA вместо текущия\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Употреба: %s list [опции]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Основни опции:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA          само показва заявките и сертификатите, асоциирани с това CA\n"
+msgstr ""
+"  -c CA          само показва заявките и сертификатите, асоциирани с това "
+"CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r              само показва информация за неуредените заявки\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
-msgstr "  -t              само показва информация за проследяваните сертификати\n"
+msgstr ""
+"  -t              само показва информация за проследяваните сертификати\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Ако изберете специфична заявка:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR        само показва списък на заявките и сертификатите, използващи тази NSS база данни\n"
+msgstr ""
+"  -d DIR        само показва списък на заявките и сертификатите, използващи "
+"тази NSS база данни\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME       само показва списък на заявките и сертификатите, използващи този псевдоним\n"
+msgstr ""
+"  -n NAME       само показва списък на заявките и сертификатите, използващи "
+"този псевдоним\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE       само показва списък на заявките и сертификатите, записани в този PEM файл\n"
+msgstr ""
+"  -f FILE       само показва списък на заявките и сертификатите, записани в "
+"този PEM файл\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S          свържи се с услугата certmonger през системната шина\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s          свържи се с услугата certmonger през сесийната шина\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Употреба: %s list-cas [опции]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA          само показва информация за CA с това име\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: непозната команда\n"
@@ -985,13 +1027,14 @@ msgstr "Не мога да определя местоположението н�
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1062,7 +1105,7 @@ msgstr "\t-p FILE    запиши PID на услугата във файл FILE
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Възникна вътрешна грешка."
 
@@ -1086,7 +1129,7 @@ msgstr "Не се поддържа хранилище на сертификат�
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Местоположението \"%s\" трябва да е абсолютен път."
@@ -1117,7 +1160,8 @@ msgstr "Местоположението \"%s\" трябва да е файл."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1130,7 +1174,7 @@ msgstr "Местоположението \"%s\" трябва да е дирек�
 msgid "Certificate nickname not specified."
 msgstr "Псевдонимът на сертификата не е определен."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Вече има заявка с псевдонима \"%s\"."
@@ -1138,9 +1182,9 @@ msgstr "Вече има заявка с псевдонима \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Сертификатът на зададеното място вече се използва  от друг псевдоним \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Сертификатът на зададеното място вече се използва  от друг псевдоним \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1169,20 +1213,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "Няма такъв CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Сертифициращият орган \"%s\" е непознат."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Неразпознат параметър или грешен тип на стойност."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bn.po b/po/bn.po
index 354ba37..a4fb5eb 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Bengali (http://www.transifex.com/projects/p/certmonger/language/bn/)\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/certmonger/"
+"language/bn/)\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index bda9606..07fc666 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/certmonger/language/bn_IN/)\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/"
+"certmonger/language/bn_IN/)\n"
+"Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bo.po b/po/bo.po
index 8136e40..6302420 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Tibetan (http://www.transifex.com/projects/p/certmonger/language/bo/)\n"
+"Language-Team: Tibetan (http://www.transifex.com/projects/p/certmonger/"
+"language/bo/)\n"
+"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/br.po b/po/br.po
index 6604acc..46755ac 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Breton (http://www.transifex.com/projects/p/certmonger/language/br/)\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/certmonger/"
+"language/br/)\n"
+"Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/brx.po b/po/brx.po
index 1de0662..fb79e18 100644
--- a/po/brx.po
+++ b/po/brx.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Bodo (http://www.transifex.com/projects/p/certmonger/language/brx/)\n"
+"Language-Team: Bodo (http://www.transifex.com/projects/p/certmonger/language/"
+"brx/)\n"
+"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: brx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index be167f8..bc5090b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/certmonger/language/bs/)\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/certmonger/"
+"language/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 49362c5..e249f9e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/certmonger/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/certmonger/"
+"language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/certmonger.pot b/po/certmonger.pot
index 2a4ca54..9860f7c 100644
--- a/po/certmonger.pot
+++ b/po/certmonger.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: certmonger 0.75.8\n"
+"Project-Id-Version: certmonger 0.75.9\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-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"
@@ -35,8 +35,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +168,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +209,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +226,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -260,7 +260,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -308,12 +308,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,606 +353,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1087,7 +1087,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1132,7 +1132,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1170,20 +1170,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 629577a..ff20586 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/certmonger/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/certmonger/"
+"language/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 6e5830e..b41efc4 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
@@ -37,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Chyba při pasování odpovědi serveru.\n"
@@ -170,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -228,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -262,7 +262,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -310,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -355,606 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>vyprší: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>email: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>dns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1089,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1172,21 +1172,21 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 #, fuzzy
 msgid "Error parsing arguments."
 msgstr "Chyba při pasování odpovědi serveru.\n"
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/cy.po b/po/cy.po
index b897fe9..46ab57a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Welsh (http://www.transifex.com/projects/p/certmonger/language/cy/)\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/certmonger/"
+"language/cy/)\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
+"11) ? 2 : 3;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 4ac46de..2c3328e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kris Thomsen <lakristho@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/certmonger/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/certmonger/"
+"language/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "Fejl under opsætning af XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Fejl under fortolkning af serversvar.\n"
@@ -102,7 +103,9 @@ msgstr "Stien \"%s\" er ikke absolut, forsøger at bruge \"%s\" istedet.\n"
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Stien \"%s\" er ikke absolut, og der opstod en fejl under bestemmelse af navnet på den nuværende mappe.\n"
+msgstr ""
+"Stien \"%s\" er ikke absolut, og der opstod en fejl under bestemmelse af "
+"navnet på den nuværende mappe.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -169,7 +172,7 @@ msgstr "Modtog fejlrespons fra lokal tjeneste %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Intet svar modtaget fra tjenesten %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +213,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Kunne ikke aftolke hovednavn for Kerberos \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +230,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Fejl: ubrugte ekstra-argumenter blev angivet.\n"
@@ -244,7 +247,8 @@ msgstr "Databasemappe og certifikatfil er begge angivet.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr "Ingen databasemappe og kaldenavn eller certifikat-fil angivet.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +259,14 @@ msgstr "Nøgle og certifikat kan ikke blive gemt i den samme fil.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "IPA-motoren kræver brug af tilvalget -K (hovednavn), når tilvalget -N (emnenavn) er brugt.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"IPA-motoren kræver brug af tilvalget -K (hovednavn), når tilvalget -N "
+"(emnenavn) er brugt.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Ingen CA med navnet \"%s\" fundet.\n"
@@ -296,7 +302,8 @@ msgstr "Ny sporingsforespørgsel kunne ikke tilføjes.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Intet ID eller databasemappe og -kaldenavn eller certifikatfil angivet.\n"
+msgstr ""
+"Intet ID eller databasemappe og -kaldenavn eller certifikatfil angivet.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -308,12 +315,12 @@ msgstr "Forspørgsel \"%s\" ændret.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Forespørgsel \"%s\" kunne ikke ændres.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Ingen forespørgsel fundet, som matchede argumenter.\n"
@@ -353,605 +360,623 @@ msgstr "Fejl under forsøg på sending \"%s\" til \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Fejl under forsøg på sending \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Antallet af certifikater og forespørgsler som spores: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Forespørgsels-id \"%s\":\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tstatus: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-fejl: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tsat fast: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>lagring for nøglepar: type=%s"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>lagring for nøglepar: "
+"type=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "INGEN"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",placering='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",kaldenavn='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",symbol='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfil='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>certifikat: type=%s,placering='%s'"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>certifikat: type=%s,"
+"placering='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tudsteder: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\temne: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tudløber: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\te-post: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\thovednavn: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tspor: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-forny: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA \"%s\":\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-type: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\thjælperplacering: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tnæste serienummer: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tkendte udstedernavne:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - udrulningsværktøj for klientcertifikat\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Brug: %s forespørgsel [tilvalg]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Påkrævede argumenter:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Hvis der bruges en NSS-database til lagring:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d MAPPE\tNSS-database for nøgle og certifikat\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr "  -n NAVN\tkaldenavn for NSS-baseret lagring (kun gyldig med -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAVN\tvalgfri symbolnavn til NSS-baseret lagring (kun gyldig med -d)\n"
+msgstr ""
+"  -t NAVN\tvalgfri symbolnavn til NSS-baseret lagring (kun gyldig med -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Hvis filer bruges til lagring:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FIL\tPEM-fil til privat nøgle\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FIL\tPEM-fil til certifikat (kun gyldig med -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Hvis nøgler skal krypteres:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FIL\tfilen som indeholder krypterings-PIN\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN-værdi\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Valgfri argumenter:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Indstillinger for certifikathåndtering:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAVN\tkaldenavn at tillægge forespørgslen\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g STØRRELSE\tstørrelsen på nøglen som skal genereres hvis der ikke allerede findes en\n"
+msgstr ""
+"  -g STØRRELSE\tstørrelsen på nøglen som skal genereres hvis der ikke "
+"allerede findes en\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tforsøg at forny certifikatet når udløbsdatoen er nær (standard)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tforsøg at forny certifikatet når udløbsdatoen er nær (standard)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr "  -R\t\tforsøg ikke at forny certifikatet når udløbsdatoen er nær\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tbrug den angivne CA i stedet for standarden\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parametre til signeringsforespørgsel:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N NAVN\tangiv forespurgt emnenavn (standard: CN=<værtsnavn>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTBRUG\tangiv forespurgt udvidet nøglebrug OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAVN\tangiv forespurgt hovednavn\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAVN\tangiv forespurgt DNS-navn\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E E-POST\tangiv forespurgt e-post-adresse\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Busindstillinger:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tforbind til certmonger-tjenesten i systembussen\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tforbind til certmonger-tjenesten i sessionsbussen\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Andre tilvalg:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
-msgstr "  -v<span class=\"whitespace other\" title=\"Tab\">»</span>rapportér alle deltaljer om fejl\n"
+msgstr ""
+"  -v<span class=\"whitespace other\" title=\"Tab\">»</span>rapportér alle "
+"deltaljer om fejl\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Brug: %s start-sporing [tilvalg]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Hvis en eksisterende forespørgsel redigeres:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAVN\tkaldenavn for eksisterende fulgt forespørgsel\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Hvis nøgler er krypteret:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAVN\tkaldenavn at give til fulgt forespørgsel\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parametre til signeringsforespørgsel ved fornyelsestidspunkt:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTBRUG\toverskriv forespurgt udvidet nøglebrug OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAVN\toverskriv forespurgt hovednavn\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAVN\toverskriv forespurgt DNS-navn\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E E-POST\toverskriv forespurgt e-post-adresse\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Brug: %s stop-sporing [tilvalg]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Efter forespørgselsidentifikator:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAVN\tkaldenavn for fulgt forespørgsel\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Brug: %s resubmit [tilvalg]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FIL\tPEM-fil til certifikat\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nye parameterværdier til signering af forespørgsel:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAVN\tnyt kaldenavn at give til fulgt forespørgsel\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tbrug den angivne CA i stedet for den nuværende\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Brug %s list [tilvalg]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Generelle tilvalg:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tvis kun forespørgsler og certifikater forbundet med denne CA\n"
+msgstr ""
+"  -c CA\tvis kun forespørgsler og certifikater forbundet med denne CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tvis kun information om specielle forespørgsler\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tvis kun information om fulgte certifikater\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Hvis en specifik forespørgsel vælges:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d MAPPE<span class=\"whitespace other\" title=\"Tab\">»</span>oplister kun forespørgsler og certs som bruger denne NSS-database\n"
+msgstr ""
+"  -d MAPPE<span class=\"whitespace other\" title=\"Tab\">»</span>oplister "
+"kun forespørgsler og certs som bruger denne NSS-database\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAVN<span class=\"whitespace other\" title=\"Tab\">»</span>oplister kun forespørgsler og certs som bruger dette kaldenavn\n"
+msgstr ""
+"  -n NAVN<span class=\"whitespace other\" title=\"Tab\">»</span>oplister kun "
+"forespørgsler og certs som bruger dette kaldenavn\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FIL<span class=\"whitespace other\" title=\"Tab\">»</span>oplister kun forespørgsler og certs, som er gemt i denne PEM-fil\n"
+msgstr ""
+"  -f FIL<span class=\"whitespace other\" title=\"Tab\">»</span>oplister kun "
+"forespørgsler og certs, som er gemt i denne PEM-fil\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tforbind til tjenesten certmonger i systembussen\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tforbind til tjenesten certmonger i sessionsbussen\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Brug: %s vis-cas [tilvalg]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\tvis kun information om CA'et med dette navn\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: ukendt kommando\n"
@@ -984,13 +1009,14 @@ msgstr "Kunne ikke bestemme placeringen af CA's XMLRPC-server.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1087,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Der opstod en intern fejl."
 
@@ -1085,7 +1111,7 @@ msgstr "Certifikatslagringstype \"%s\" er ikke understøttet."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Placeringen \"%s\" skal være en absolut sti."
@@ -1116,7 +1142,8 @@ msgstr "Placeringen \"%s\" skal være en fil."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1156,7 @@ msgstr "Placeringen \"%s\" skal være en mappe."
 msgid "Certificate nickname not specified."
 msgstr "Certifikatkaldenavn ikke angivet."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Der er allerede en forespørgsel med kaldenavnet \"%s\"."
@@ -1137,8 +1164,7 @@ msgstr "Der er allerede en forespørgsel med kaldenavnet \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1194,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "Ingen sådan CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Certifikatsautoritet \"%s\" er ikke kendt."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Ikke opdaget parameter eller forkert værditype."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 306f9eb..4db4a9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Fabian Affolter <fab@fedoraproject.org>, 2014
 # hpeters <hpeters@redhat.com>, 2012
@@ -12,20 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/certmonger/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/certmonger/"
+"language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
 msgid "Unable to determine hostname of CA.\n"
-msgstr "Rechnername der Zertifizierungsstelle (CA) konnte nicht ermittelt werden.\n"
+msgstr ""
+"Rechnername der Zertifizierungsstelle (CA) konnte nicht ermittelt werden.\n"
 
 #: src/certmaster.c:146 src/dogtag.c:438 src/ipa.c:271
 #, c-format
@@ -40,8 +42,8 @@ msgstr "Fehler beim Einrichten von XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Fehler beim Abfragen der Serverantwort.\n"
@@ -106,7 +108,9 @@ msgstr "Pfad »%s« ist nicht absolut, versuche stattdessen »%s« zu verwenden.
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Pfad »%s« ist nicht absolut. Außerdem trat beim Ermitteln des Namens des aktuellen Ordners ein Fehler auf.\n"
+msgstr ""
+"Pfad »%s« ist nicht absolut. Außerdem trat beim Ermitteln des Namens des "
+"aktuellen Ordners ein Fehler auf.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -173,7 +177,7 @@ msgstr "Fehlermeldung erhalten vom lokalen Dienst %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Keine Antwort vom %s-Dienst erhalten.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -214,13 +218,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Fehler beim Unparsen des Principal-Namens »%s« für Kerberos: %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erfordert einen Parameter -- »%c«\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- »%c«\n"
@@ -231,7 +235,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Fehler: unbenötigter, zusätzlicher Parameter »%s«.\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Fehler: unbenötigte, zusätzliche Parameter wurden angegeben.\n"
@@ -244,27 +248,34 @@ msgstr "Ort der Datenbank oder Kurzname allein angegeben.\n"
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
 msgid "Database directory and certificate file both specified.\n"
-msgstr "Sowohl Datenbankordner als auch Zertifikatdatei wurden nicht angegeben.\n"
+msgstr ""
+"Sowohl Datenbankordner als auch Zertifikatdatei wurden nicht angegeben.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Weder Datenbankordner noch Kurzname oder Zertifikatdatei wurden angegeben.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Weder Datenbankordner noch Kurzname oder Zertifikatdatei wurden angegeben.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "Schlüssel und Zertifikat können nicht in der gleichen Datei gespeichert werden.\n"
+msgstr ""
+"Schlüssel und Zertifikat können nicht in der gleichen Datei gespeichert "
+"werden.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Das IPA-Backend benötigt die Option -K (Name des Principals), wenn die Option -N (Name des Subjekts) verwendet wird.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Das IPA-Backend benötigt die Option -K (Name des Principals), wenn die "
+"Option -N (Name des Subjekts) verwendet wird.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Keine Zertifizierungsstelle mit dem Namen »%s« gefunden.\n"
@@ -300,7 +311,8 @@ msgstr "Neue Überwachungsanfrage konnte nicht hinzugefügt werden.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Kennung, Datenbankordner, Kurzname und Zertifikatdatei nicht angegeben.\n"
+msgstr ""
+"Kennung, Datenbankordner, Kurzname und Zertifikatdatei nicht angegeben.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -312,12 +324,12 @@ msgstr "Anfrage »%s« wurde geändert.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Anfrage »%s« konnte nicht geändert werden.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Keine Anfrage mit angegebenem Kurznamen gefunden.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Keine mit den Parametern übereinstimmende Anfrage gefunden.\n"
@@ -357,605 +369,633 @@ msgstr "Fehler beim Versuch, »%s« an »%s« zu übertragen.\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Fehler beim Versuch, »%s« zu übertragen.\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Anzahl der Zertifikate und überwachten Anfragen: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Anfragekennung »%s«:\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tStatus: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tCA-Fehler: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tstecken geblieben: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tSchlüsselpaar-Speicher: Typ=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NICHTS"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",Ort=»%s«"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",Kurzname=»%s«"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",Token=»%s«"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",PIN=»%s«"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",PIN-Datei=»%s«"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tZertifikat: Typ=%s, Ort=»%s«"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tAusgabestelle: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tSubjekt: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tAblauf: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tE-Mail: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tDNS: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tPrincipal-Name: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
-msgstr "Schlüsselbenutzung: %s\n\n"
+msgstr ""
+"Schlüsselbenutzung: %s\n"
+"\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\tEKU: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "»Befehl vor dem Speichern: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "»Befehl nach dem Speichern: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tTrack: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tAuto-Erneuern: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA »%s«:\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tCA-Typ: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tHelper-Speicherort: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tNächste Seriennummer: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tBekannte Ausstellernamen:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - Tool z. Client-Zertifikatanmeldung\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Aufruf: %s request [Optionen]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Benötigte Parameter:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Falls in einer NSS-Datenbank gespeichert wird:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tNSS-Datenbank für Schlüssel und Zertifikat\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr "  -n NAME\tKurzname für NSS-basierte Speicherung (nur gültig mit -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAME\toptionaler Token-Name für NSS-basierte Speicherung (nur gültig mit -d)\n"
+msgstr ""
+"  -t NAME\toptionaler Token-Name für NSS-basierte Speicherung (nur gültig "
+"mit -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Falls Dateien zum Speichern verwendet werden:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k DATEI\tPEM-Datei für geheimen Schlüssel\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f DATEI\tPEM-Datei für Zertifikat (nur gültig mit -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Falls Schlüssel verschlüsselt werden sollen:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p DATEI\tDatei, welche die Verschlüsselungs-PIN enthält\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN-Wert\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Optionale Parameter:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Einstellungen für Umgang mit Zertifikaten:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME\tder Anfrage zuzuordnender Kurzname\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g GRÖSSE\tGröße des zu generierenden Schlüssels, falls noch keiner vorhanden ist\n"
+msgstr ""
+"  -g GRÖSSE\tGröße des zu generierenden Schlüssels, falls noch keiner "
+"vorhanden ist\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tversuchen, kurz vor Ablauf das Zertifikat zu erneuern (Standard)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tversuchen, kurz vor Ablauf das Zertifikat zu erneuern (Standard)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -r\t\tnicht versuchen, kurz vor Ablauf das Zertifikat zu erneuern (Standard)\n"
+msgstr ""
+"  -r\t\tnicht versuchen, kurz vor Ablauf das Zertifikat zu erneuern "
+"(Standard)\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
-msgstr "  -c CA\tAngegebene Zertifizierungsstelle statt der aktuellen verwenden\n"
+msgstr ""
+"  -c CA\tAngegebene Zertifizierungsstelle statt der aktuellen verwenden\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\tAnfrage an CA, um den Antrag unter Verwendung des benannten Profils oder der Vorlage auszuführen\n"
+msgstr ""
+"  -T PROFILE\tAnfrage an CA, um den Antrag unter Verwendung des benannten "
+"Profils oder der Vorlage auszuführen\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parameter für die Signaturanfrage:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME\tAngefragten Subjektnamen festlegen (Standard: CN=<hostname>)\n"
+msgstr ""
+"  -N NAME\tAngefragten Subjektnamen festlegen (Standard: CN=<hostname>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tAngefragte OID für erweiterte Schlüsselverwendung festlegen\n"
+msgstr ""
+"  -U EXTUSAGE\tAngefragte OID für erweiterte Schlüsselverwendung festlegen\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
-msgstr "  -u SCHLÜSSELNUTZUNG\tGewünschter Wert für SchlüsselBenutzung setzen\n"
+msgstr ""
+"  -u SCHLÜSSELNUTZUNG\tGewünschter Wert für SchlüsselBenutzung setzen\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME\tAngefragten Principal-Namen festlegen\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAME\tAngefragten DNS-Namen festlegen\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\tAngefragte E-Mail-Adresse festlegen\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Busoptionen:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tmit dem Certmonger-Dienst über den Systembus verbinden\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -S\t\tmit dem Certmonger-Dienst über den Sitzungsbus verbinden\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Weitere Optionen:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr " -B»Auszuführender Befehl vor dem Speichern des Zertifikats\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr " -C\tAuszuführender Befehl nach dem Speichern des Zertifikats\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\tAlle Fehlerdetails ausgeben\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Aufruf: %s start-tracking [Optionen]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Falls eine existierende Anfrage geändert wird:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME\tKurzname für existierende Überwachungsanfrage\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Falls Schlüssel verschlüsselt sind:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME\tNeuer Kurzname für die Überwachungsanfrage\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parameter für die Signaturanfrage zum Zeitpunkt der Erneuerung:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tAngefragte OID für erweiterte Schlüsselverwendung überschreiben\n"
+msgstr ""
+"  -U EXTUSAGE\tAngefragte OID für erweiterte Schlüsselverwendung "
+"überschreiben\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME\tangefragten Principal-Name überschreiben\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\tangefragten DNS-Namen überschreiben\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\tangefragte E-Mail-Adresse überschreiben\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Aufruf: %s stop-tracking [Optionen]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Nach Anfrage-Kennung:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME\tKurzname für Überwachungsanfrage\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Aufruf: %s resubmit [Optionen]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f DATEI\tPEM-Datei des Zertifikats\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Neue Parameterwerte für die Signaturanfrage:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\tNeuer Kurzname für die Überwachungsanfrage\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
-msgstr "  -c CA\t\tAngegebene Zertifizierungsstelle statt der aktuellen verwenden\n"
+msgstr ""
+"  -c CA\t\tAngegebene Zertifizierungsstelle statt der aktuellen verwenden\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Aufruf: %s list [Optionen]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Allgemeine Optionen:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tNur die dieser Zertifizierungsstelle zugeordneten Anfragen und Zertifikate auflisten\n"
+msgstr ""
+"  -c CA\tNur die dieser Zertifizierungsstelle zugeordneten Anfragen und "
+"Zertifikate auflisten\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tNur Informationen zu offenen Anfragen auflisten\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tNur Informationen zu überwachten Zertifikaten auflisten\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Falls bestimmte Anfrage ausgewählt wird:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d VERZ\tnur Anfragen und Zertifikate auflisten, die diese NSS-Datenbank nutzen\n"
+msgstr ""
+"  -d VERZ\tnur Anfragen und Zertifikate auflisten, die diese NSS-Datenbank "
+"nutzen\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME\tnur Anfragen und Zertifikate auflisten, die diesen Kurznamen nutzen\n"
+msgstr ""
+"  -n NAME\tnur Anfragen und Zertifikate auflisten, die diesen Kurznamen "
+"nutzen\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f DATEI\tnur Anfragen und Zertifikate auflisten, die in dieser PEM-Datei gespeichert sind\n"
+msgstr ""
+"  -f DATEI\tnur Anfragen und Zertifikate auflisten, die in dieser PEM-Datei "
+"gespeichert sind\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tmit dem Certmonger-Dienst über den Systembus verbinden\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -S\tmit dem Certmonger-Dienst über den Sitzungsbus verbinden\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Aufruf: %s list-cas [Optionen]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
-msgstr "  -c CA\tNr Informationen zu Zertifizierungsstellen dieses Namens auflisten\n"
+msgstr ""
+"  -c CA\tNr Informationen zu Zertifizierungsstellen dieses Namens auflisten\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: Unbekannter Befehl.\n"
@@ -963,17 +1003,20 @@ msgstr "%s: Unbekannter Befehl.\n"
 #: src/ipa.c:151
 #, c-format
 msgid "The -t option can not be used with the -K option.\n"
-msgstr "Die -t Option kann nicht zusammen mit der -K Option verwendet werden.\n"
+msgstr ""
+"Die -t Option kann nicht zusammen mit der -K Option verwendet werden.\n"
 
 #: src/ipa.c:159
 #, c-format
 msgid "The -k option can not be used with the -K option.\n"
-msgstr "Die -k Option kann nicht zusammen mit der -K Option verwendet werden.\n"
+msgstr ""
+"Die -k Option kann nicht zusammen mit der -K Option verwendet werden.\n"
 
 #: src/ipa.c:167
 #, c-format
 msgid "The -K option can not be used with either the -k or the -t option.\n"
-msgstr "Die -K Option kann weder mit der -k noch der -t Option verwendet werden.\n"
+msgstr ""
+"Die -K Option kann weder mit der -k noch der -t Option verwendet werden.\n"
 
 #: src/ipa.c:238
 #, c-format
@@ -988,13 +1031,14 @@ msgstr "XMLRPC-Serverort des Zertifikats konnte nicht ermittelt werden.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1065,7 +1109,7 @@ msgstr "\t-p FILE    Dienst-PID in Datei schreiben\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         NSS in FIPS-Modus ausführen\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Ein interner Fehler ist aufgetreten."
 
@@ -1089,7 +1133,7 @@ msgstr "Speichertyp »%s« des Zertifikats wird nicht unterstützt."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Der Ort »%s« muss ein absoluter Pfad sein."
@@ -1120,7 +1164,8 @@ msgstr "Der Ort »%s« muss eine Datei sein."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1133,7 +1178,7 @@ msgstr "Der Ort »%s« muss ein Ordner sein."
 msgid "Certificate nickname not specified."
 msgstr "Kurzname des Zertifikats nicht angegeben."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Es gibt bereits eine Anfrage mit dem Kurznamen »%s«."
@@ -1141,9 +1186,10 @@ msgstr "Es gibt bereits eine Anfrage mit dem Kurznamen »%s«."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Zertifikat am gleichen Speicherort wird bereits von Anfrage mit Kurznamen »%s« verwendet."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Zertifikat am gleichen Speicherort wird bereits von Anfrage mit Kurznamen "
+"»%s« verwendet."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1161,7 +1207,9 @@ msgstr "Kurzname des Schlüssels nicht angegeben."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Schlüssel am gleichen Speicherort wird bereits von Anfrage mit Kurznamen »%s« verwendet."
+msgstr ""
+"Schlüssel am gleichen Speicherort wird bereits von Anfrage mit Kurznamen "
+"»%s« verwendet."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1172,26 +1220,27 @@ msgstr ""
 msgid "No such CA."
 msgstr "Keine solche Zertifizierungsstelle."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Zertifizierungsstelle »%s« ist unbekannt."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Nicht erkannter Parameter oder falscher Werttyp."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
 #: src/tdbusm.c:1953
 msgid "Insufficient access.  Please retry operation as root.\n"
-msgstr "Unzureichende Berechtigung.  Bitte führen Sie die Aktion als Root aus.\n"
+msgstr ""
+"Unzureichende Berechtigung.  Bitte führen Sie die Aktion als Root aus.\n"
 
 #: src/tdbusm.c:1957
 msgid "Please verify that the certmonger service has been started.\n"
@@ -1199,4 +1248,5 @@ msgstr "Bitte überprüfen Sie, ob der Certmonger-Dienst gestartet wurde.\n"
 
 #: src/tdbusm.c:1960
 msgid "Please verify that the certmonger service is still running.\n"
-msgstr "Bitte vergewissern Sie sich, dass der Certmonger-Dienst immer noch läuft.\n"
+msgstr ""
+"Bitte vergewissern Sie sich, dass der Certmonger-Dienst immer noch läuft.\n"
diff --git a/po/de_CH.po b/po/de_CH.po
index 38c25f1..39893bb 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/certmonger/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
+"certmonger/language/de_CH/)\n"
+"Language: de_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/dz.po b/po/dz.po
index c94f5df..609c66c 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Dzongkha (http://www.transifex.com/projects/p/certmonger/language/dz/)\n"
+"Language-Team: Dzongkha (http://www.transifex.com/projects/p/certmonger/"
+"language/dz/)\n"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 2dceef3..a412510 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/certmonger/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/certmonger/"
+"language/el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index deccc1d..bb5023d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/certmonger/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
+"certmonger/language/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 32954f3..746681f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/certmonger/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/certmonger/"
+"language/eo/)\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 127f366..540fff9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2011, 2012
 # Daniel Cabrera <logan@fedoraproject.org>, 2011
@@ -16,14 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/certmonger/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/certmonger/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -44,8 +45,8 @@ msgstr "Error al definir XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Error analizando la respuesta del servidor.\n"
@@ -68,7 +69,9 @@ msgstr "Sin URL de entidad final (-E) dada, y no hay conocida por defecto\n"
 #: src/dogtag.c:370
 #, c-format
 msgid "No agent URL (-A) given, and no default known.\n"
-msgstr "Sin URL agente (-A) dada, y no hay conocido por defecto\n\n"
+msgstr ""
+"Sin URL agente (-A) dada, y no hay conocido por defecto\n"
+"\n"
 
 #: src/dogtag.c:374
 #, c-format
@@ -103,14 +106,17 @@ msgstr "Error interno: no hay respuesta para \"%s?%s\".\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "La dirección \"%s\" no es absoluta, intentando usar \"%s\" en su lugar.\n"
+msgstr ""
+"La dirección \"%s\" no es absoluta, intentando usar \"%s\" en su lugar.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "La ruta \"%s\" no es absoluta, y hubo un error al determinar el nombre del directorio actual.\n"
+msgstr ""
+"La ruta \"%s\" no es absoluta, y hubo un error al determinar el nombre del "
+"directorio actual.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -145,7 +151,9 @@ msgstr "Error conectando con DBus.\n"
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
 msgid "Please verify that the message bus (D-Bus) service is running.\n"
-msgstr "Por favor verifique que el servicio de bus de mensajes (D-Bus) se encuentre funcionando.\n"
+msgstr ""
+"Por favor verifique que el servicio de bus de mensajes (D-Bus) se encuentre "
+"funcionando.\n"
 
 #: src/getcert.c:282
 #, c-format
@@ -177,7 +185,7 @@ msgstr "Se ha recibido una respuesta de erro desde el servicio %s local.\n"
 msgid "No response received from %s service.\n"
 msgstr "No se ha recibido una respuesta desde el servicio %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -215,16 +223,17 @@ msgstr "Error analizando el nombre  \"%s\"del principal de Kerberos: %s.\n"
 #: src/getcert.c:724 src/getcert.c:1565 src/getcert.c:2045
 #, c-format
 msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
-msgstr "Error al dejar de analizar el nombre \"%s\" del principal de Kerberos: %s.\n"
+msgstr ""
+"Error al dejar de analizar el nombre \"%s\" del principal de Kerberos: %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opción requiere un argumento -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción no valida -- '%c'\n"
@@ -235,7 +244,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Error: argumento extra no utilizado \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Error: se enviaron argumentos extra no usados.\n"
@@ -243,32 +252,43 @@ msgstr "Error: se enviaron argumentos extra no usados.\n"
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
 msgid "Database location or nickname specified without the other.\n"
-msgstr "La ubicación de la base de datos, o el apodo, han sido indicados el uno sin el otro.\n"
+msgstr ""
+"La ubicación de la base de datos, o el apodo, han sido indicados el uno sin "
+"el otro.\n"
 
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
 msgid "Database directory and certificate file both specified.\n"
-msgstr "Han sido especificados el directorio de la base de datos y el archivo de certificado.\n"
+msgstr ""
+"Han sido especificados el directorio de la base de datos y el archivo de "
+"certificado.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "No han sido especificados ni el directorio de la base de datos, ni el apodo del archivo de certificado.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"No han sido especificados ni el directorio de la base de datos, ni el apodo "
+"del archivo de certificado.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "La llave y el certificado no pueden ambos ser guardados en un mismo archivo.\n"
+msgstr ""
+"La llave y el certificado no pueden ambos ser guardados en un mismo "
+"archivo.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "El motor de IPA necesita la utilización de la opción -K (el nombre del principal) cuando se esté utilizando la opción -N (el nombre del asunto).\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"El motor de IPA necesita la utilización de la opción -K (el nombre del "
+"principal) cuando se esté utilizando la opción -N (el nombre del asunto).\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "No se ha encontrado un CA con el nombre \"%s\".\n"
@@ -304,7 +324,9 @@ msgstr "Nueva solicitud de seguimiento no puede ser agregada.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "No se ha especificado ningún ID, o directorio de base de datos y apodo, o archivo de certificado.\n"
+msgstr ""
+"No se ha especificado ningún ID, o directorio de base de datos y apodo, o "
+"archivo de certificado.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -316,12 +338,12 @@ msgstr "Solicitud \"%s\" modificada.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Solicitud \"%s\" no puede ser modificada.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "No han sido halladas peticiones con el alias indicado.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "No se encontraron solicitudes que coincidan con los argumentos.\n"
@@ -361,605 +383,644 @@ msgstr "Error intentando enviar \"%s\" hacia \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Error intentando enviar \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
-msgstr "Cantidad de peticiones y certificados que están siendo rastrados: %d.\n"
+msgstr ""
+"Cantidad de peticiones y certificados que están siendo rastrados: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID de solicitud '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\testado: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-error: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tstuck: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>par de clave almacenada: tipo=%s"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>par de clave "
+"almacenada: tipo=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",ubicación='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",usuario='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",archivopin='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>certificado: tipo=%s,ubicación='%s'"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>certificado: tipo=%s,"
+"ubicación='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tgenerador: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tasunto: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\texpira: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tcorreo electrónico: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnombre del principal: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "⇥Dirección IP:"
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
-msgstr "\tutilización de clave: %s\n\n"
+msgstr ""
+"\tutilización de clave: %s\n"
+"\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr "⇥certificados raíz guardados en un archivo:\n"
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr "⇥otros certificados raíz guardados en un archivo:\n"
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr "⇥otros certificados guardados en un archivo:\n"
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr "⇥certificados raíz guardados en la base de datos:\n"
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr "⇥otros certificados raíz guardados en la base de datos:\n"
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr "⇥otros certificados guardados en la base de datos:\n"
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tcomando de almacenado previo: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tcomando de almacenado posterior: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttrack: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto renovación: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\ttipo de tca: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tubicación del asistente: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tnúmero de serie siguiente: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnombres de generadores conocidos:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s . herramienta de inscripción de certificado de cliente\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Utilización: petición %s [opciones]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Argumentos requeridos:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
-msgstr "* si se está utilizando para el almacenamiento una base de datos NSS:\n"
+msgstr ""
+"* si se está utilizando para el almacenamiento una base de datos NSS:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tbase de datos NSS para la llave y el certificado\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAME\tapodo para el almacenamiento basado en NSS (sólo valido con -d)\n"
+msgstr ""
+"  -n NAME\tapodo para el almacenamiento basado en NSS (sólo valido con -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAME\tnombre opcional de la ficha para el almacenamiento basado en NSS (sólo valido con -d)\n"
+msgstr ""
+"  -t NAME\tnombre opcional de la ficha para el almacenamiento basado en NSS "
+"(sólo valido con -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* si se están utilizando archivos para el almacenamiento:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE\tarchivoPEM para la llave privada\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE\tarchivo PEM para el certificado (sólo válido con -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* si la llaves serán cifradas:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE\tarchivo que contiene el PIN de cifrado\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tvalor del PIN\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Argumentos opcionales:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Configuración de la manipulación del certificado:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME\tapodo a ser asignado a la petición\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
-msgstr "-G TYPE⇥tipo de llave a ser generada si no hay alguna en su lugar\n\n"
+msgstr ""
+"-G TYPE⇥tipo de llave a ser generada si no hay alguna en su lugar\n"
+"\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g SIZE\ttamaño de la llave a ser generada si aún no existe ninguna\n"
+msgstr ""
+"  -g SIZE\ttamaño de la llave a ser generada si aún no existe ninguna\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tintento de renovación del certificado cuando el momento de expiración esté próximo (predeterminado)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tintento de renovación del certificado cuando el momento de "
+"expiración esté próximo (predeterminado)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tno intentar renovar el certificado cuando el momento de expiración esté próximo\n"
+msgstr ""
+"  -R\t\tno intentar renovar el certificado cuando el momento de expiración "
+"esté próximo\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tutilizar el CA indicado en lugar del predeterminado\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\tpide a CA el proceso de la solicitud utilizando el perfil o el modelo invocado\n"
+msgstr ""
+"  -T PROFILE\tpide a CA el proceso de la solicitud utilizando el perfil o el "
+"modelo invocado\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parámetros para la petición de identificación:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME\tdefine el nombre del asunto solicitado (predeterminado: CN=<nombre del equipo>)\n"
+msgstr ""
+"  -N NAME\tdefine el nombre del asunto solicitado (predeterminado: "
+"CN=<nombre del equipo>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tdefine  la utilización OID de la extensión de la llave solicitada\n"
+msgstr ""
+"  -U EXTUSAGE\tdefine  la utilización OID de la extensión de la llave "
+"solicitada\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
-msgstr "  -u KEYUSAGE\tfijado el valor de utilzación de clave pedido\n\n"
+msgstr ""
+"  -u KEYUSAGE\tfijado el valor de utilzación de clave pedido\n"
+"\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME\tdefine el nombre del principal solicitado\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAME\tdefine el nombre DNS solicitado\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\tdefine la dirección de correo electrónico solicitada\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr "  -A ADDRESS⇥define la dirección IP solicitada\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Opciones de Bus:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tconectar al servicio certmonger en el bus del sistema\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tconectar al servicio certmonger en el bus de sesión\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Otras opciones:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tcomando a ejecutar antes de guardar el certificado\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tcomando a ejecutar luego de guardar el certificado\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
-msgstr "  -v<span class=\"whitespace other\" title=\"Tab\">»</span>informar todos los detalles de errores\n"
+msgstr ""
+"  -v<span class=\"whitespace other\" title=\"Tab\">»</span>informar todos "
+"los detalles de errores\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Utilización: %s iniciar seguimiento [opciones]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Si se está modificando una petición existente:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME\tnombre de apodo de una petición de seguimiento existente\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Si las llaves se encuentran cifradas:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME\tapodo a darle a la petición de seguimiento\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
-msgstr "* Parámetros para la solicitud de firma en el momento de la renovación:\n"
+msgstr ""
+"* Parámetros para la solicitud de firma en el momento de la renovación:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\treemplazar la utilización de llave extendida OID solicitada\n"
+msgstr ""
+"  -U EXTUSAGE\treemplazar la utilización de llave extendida OID solicitada\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME\treemplazar el nombre principal solicitado\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\treemplazar el nombre DNS solicitado\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\treemplazar la dirección de correo electrónico solicitada\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr "  -A ADDRESS⇥remplazar la dirección IP solicitada\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Utilziación: %s detener seguimiento [opciones]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Por identificador de petición:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME\tapodo de la petición de seguimiento\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Utilización: %s volver a enviar [opciones]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE\tarchivo PEM del certificado\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nuevos valores de los parámetros de la petición de identificación:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\tnuevo apodo a darle a la petición de seguimiento\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tutilizar el CA indicado en lugar del actual\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Utilización: %s lista [opciones]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Opciones generales:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tlista sólo las peticiones y los certificados asociados con este CA\n"
+msgstr ""
+"  -c CA\tlista sólo las peticiones y los certificados asociados con este CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tlista sólo la información acerca de peticiones destacadas\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tlista sólo información acerca de certificados en seguimiento\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Si selecciona un pedido específico:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span> sólo lista los pedidos y certificados que usa esta base de datos NSS\n"
+msgstr ""
+"  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span> sólo lista "
+"los pedidos y certificados que usa esta base de datos NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NOMBRE<span class=\"whitespace other\" title=\"Tab\">»</span>sólo lista los pedidos y certificados que usan este apodo\n"
+msgstr ""
+"  -n NOMBRE<span class=\"whitespace other\" title=\"Tab\">»</span>sólo lista "
+"los pedidos y certificados que usan este apodo\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f ARCHIVO <span class=\"whitespace other\" title=\"Tab\">»</span>sólo lista los pedidos y certificados guardados en este archivo PEM\n"
+msgstr ""
+"  -f ARCHIVO <span class=\"whitespace other\" title=\"Tab\">»</span>sólo "
+"lista los pedidos y certificados guardados en este archivo PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tconectar con el servicio certmonger en el bus del sistema\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tconectar con el servicio certmonger en el bus de la sesión\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Utilización: %s list-cas [opciones]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
-msgstr "  -c CA\tlista sólo la información de este nombre relacionada con el CA\n"
+msgstr ""
+"  -c CA\tlista sólo la información de este nombre relacionada con el CA\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: comando no reconocido\n"
@@ -977,12 +1038,16 @@ msgstr "La opción -k no puede ser utilizada junto con la opción -K.\n"
 #: src/ipa.c:167
 #, c-format
 msgid "The -K option can not be used with either the -k or the -t option.\n"
-msgstr "La opción -K no puede ser utilizada junto con la opción -k, ni con la opción -t.\n"
+msgstr ""
+"La opción -K no puede ser utilizada junto con la opción -k, ni con la opción "
+"-t.\n"
 
 #: src/ipa.c:238
 #, c-format
 msgid "Unable to determine principal name for signing request.\n"
-msgstr "No es posible determinar el nombre del principal para la petición de identificación.\n"
+msgstr ""
+"No es posible determinar el nombre del principal para la petición de "
+"identificación.\n"
 
 #: src/ipa.c:255
 #, c-format
@@ -992,26 +1057,35 @@ msgstr "No es posible determinar la ubicación del servidor CA XMLRPC.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Error definiendo ccache para el servicio del \"equipo\" utilizando el keytab predeterminado: %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Error definiendo ccache para el servicio del \"equipo\" utilizando el keytab "
+"predeterminado: %s.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Error definiendo ccache para \"%s\" en el cliente utilizando el keytab predeterminado: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Error definiendo ccache para \"%s\" en el cliente utilizando el keytab "
+"predeterminado: %s.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Error definiendo ccache para el servicio del \"equipo\" en el cliente utilizando el keytab \"%s\": %s\n"
+msgstr ""
+"Error definiendo ccache para el servicio del \"equipo\" en el cliente "
+"utilizando el keytab \"%s\": %s\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Error definiendo ccache para \"%s\" en el cliente utilizando el keytab \"%s\": %s.\n"
+msgstr ""
+"Error definiendo ccache para \"%s\" en el cliente utilizando el keytab \"%s"
+"\": %s.\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1026,7 +1100,8 @@ msgstr "No es posible determinar la ubicación del servidor IPA LDAP\n"
 #: src/ipa.c:490
 #, c-format
 msgid "Unable to determine base DN of domain information on IPA server.\n"
-msgstr "No es posible determinar la base DN de el dominio de en el servidor IPA\n"
+msgstr ""
+"No es posible determinar la base DN de el dominio de en el servidor IPA\n"
 
 #: src/main.c:120
 #, c-format
@@ -1067,9 +1142,11 @@ msgstr "\t-p FILE    escribir servicio PID al archivo \n"
 
 #: src/main.c:132
 msgid "\t-F         force NSS into FIPS mode\n"
-msgstr "\t-F         forzar NSS en modo FIPS\n\n"
+msgstr ""
+"\t-F         forzar NSS en modo FIPS\n"
+"\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Ha ocurrido un error interno."
 
@@ -1089,11 +1166,12 @@ msgstr "No ha sido especificado el tipo de certificado de almacenamiento."
 #: src/tdbush.c:449
 #, c-format
 msgid "Certificate storage type \"%s\" not supported."
-msgstr "No existe soporte para el tipo \"%s\" de certificado de almacenamiento."
+msgstr ""
+"No existe soporte para el tipo \"%s\" de certificado de almacenamiento."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "La ubicación \"%s\" debe ser una ruta absoluta."
@@ -1108,7 +1186,9 @@ msgstr "No ha sido indicada una ubicación del certificado de almacenamiento."
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "El padre de la ubicación \"%s\" no pudo ser accesado debido a permisos insuficientes."
+msgstr ""
+"El padre de la ubicación \"%s\" no pudo ser accesado debido a permisos "
+"insuficientes."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1124,8 +1204,10 @@ msgstr "La ubicación \"%s\" debe ser un archivo."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
-msgstr "La ubicación \"%s\" no pudo ser accesada debido a permisos insuficientes."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
+msgstr ""
+"La ubicación \"%s\" no pudo ser accesada debido a permisos insuficientes."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
 #: src/tdbush.c:1145
@@ -1137,7 +1219,7 @@ msgstr "La ubicación \"%s\" debe ser un directorio."
 msgid "Certificate nickname not specified."
 msgstr "No ha sido especificado un apodo de certificado."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Ya existe una petición con el apodo \"%s\"."
@@ -1145,9 +1227,10 @@ msgstr "Ya existe una petición con el apodo \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Un certificado en la misma ubicación ya está siendo utilizado por la petición hecha con el alias \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Un certificado en la misma ubicación ya está siendo utilizado por la "
+"petición hecha con el alias \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1165,7 +1248,9 @@ msgstr "No ha sido especificado un apodo de llave."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Una llave en la misma ubicación ya está siendo utilizada por la petición hecha con el alias \"%s\"."
+msgstr ""
+"Una llave en la misma ubicación ya está siendo utilizada por la petición "
+"hecha con el alias \"%s\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1176,20 +1261,20 @@ msgstr "Sin soporte para tipo de llave %s\"."
 msgid "No such CA."
 msgstr "No existe el CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "No se conoce la autoridad \"%s\" del certifiicado. "
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Parámetro irreconocible o tipo de valor erróneo."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Error analizando argumentos."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Nombre de propiedad no reconocido."
 
@@ -1203,4 +1288,5 @@ msgstr "Por favor verifique que el servicio certmonger ha sido arrancado.\n"
 
 #: src/tdbusm.c:1960
 msgid "Please verify that the certmonger service is still running.\n"
-msgstr "Por favor verifique que el servicio certmonger está todavía corriendo.\n"
+msgstr ""
+"Por favor verifique que el servicio certmonger está todavía corriendo.\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index fc1a2cd..c0ec2cc 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/et.po b/po/et.po
index 284965d..1bacdd8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/certmonger/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/certmonger/"
+"language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/eu.po b/po/eu.po
index ebf6042..b96f9b4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/certmonger/language/eu/)\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/certmonger/"
+"language/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -308,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Beharrezko argumentuak:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Hautazko argumentuak:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Beste aukerak:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Aukera orokorrak:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -984,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 3c06d55..97202aa 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 0c1f611..e471432 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/certmonger/language/fa/)\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/certmonger/"
+"language/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 010c714..8758348 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index fe94cb5..2b4a655 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/certmonger/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/certmonger/"
+"language/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index bc4c7da..f5fa157 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # dominique bribanick <chepioq@gmail.com>, 2012
 # Gé Baylard <geodebay@gmail.com>, 2014
@@ -12,20 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/certmonger/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/certmonger/"
+"language/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
 msgid "Unable to determine hostname of CA.\n"
-msgstr "Impossible de déterminer le nom d'hôte de l'autorité de certification.\n"
+msgstr ""
+"Impossible de déterminer le nom d'hôte de l'autorité de certification.\n"
 
 #: src/certmaster.c:146 src/dogtag.c:438 src/ipa.c:271
 #, c-format
@@ -40,8 +42,8 @@ msgstr "Erreur lors de la configuration de XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Erreur d'analyse de la réponse du serveur.\n"
@@ -59,17 +61,21 @@ msgstr "Renouvellement demandé, mais numéro de série manquant.\n"
 #: src/dogtag.c:366
 #, c-format
 msgid "No end-entity URL (-E) given, and no default known.\n"
-msgstr "Aucune URL d'entité finale spécifiée (-E), et aucune valeur par défaut connue.\n"
+msgstr ""
+"Aucune URL d'entité finale spécifiée (-E), et aucune valeur par défaut "
+"connue.\n"
 
 #: src/dogtag.c:370
 #, c-format
 msgid "No agent URL (-A) given, and no default known.\n"
-msgstr "Aucune URL d'agent spécifiée (-A), et aucune valeur par défaut connue.\n"
+msgstr ""
+"Aucune URL d'agent spécifiée (-A), et aucune valeur par défaut connue.\n"
 
 #: src/dogtag.c:374
 #, c-format
 msgid "No profile/template (-T) given, and no default known.\n"
-msgstr "Aucune profil ou patron spécifié (-T), et aucune valeur par défaut connue.\n"
+msgstr ""
+"Aucune profil ou patron spécifié (-T), et aucune valeur par défaut connue.\n"
 
 #: src/dogtag.c:382
 #, c-format
@@ -99,14 +105,18 @@ msgstr "Erreur interne : pas de réponse à « %s?%s ».\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Le chemin « %s » n'est pas absolu, tentative d'utilisation de « %s » à la place.\n"
+msgstr ""
+"Le chemin « %s » n'est pas absolu, tentative d'utilisation de « %s » à la "
+"place.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Le chemin d'accès « %s » n'est pas absolu, et il y a une erreur pour déterminer le nom du répertoire courant.\n"
+msgstr ""
+"Le chemin d'accès « %s » n'est pas absolu, et il y a une erreur pour "
+"déterminer le nom du répertoire courant.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -141,7 +151,9 @@ msgstr "Erreur de connexion à DBus.\n"
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
 msgid "Please verify that the message bus (D-Bus) service is running.\n"
-msgstr "Veuillez vérifier que le service bus de messages (D-Bus) est en cours d'exécution.\n"
+msgstr ""
+"Veuillez vérifier que le service bus de messages (D-Bus) est en cours "
+"d'exécution.\n"
 
 #: src/getcert.c:282
 #, c-format
@@ -173,7 +185,7 @@ msgstr "Un message d'erreur a été reçu du service local %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Pas de réponse du service %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,16 +223,17 @@ msgstr "Erreur lors de l'analyse du nom principal Kerberos « %s » : %s.\n"
 #: src/getcert.c:724 src/getcert.c:1565 src/getcert.c:2045
 #, c-format
 msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
-msgstr "Erreur lors de la récupération du nom principal Kerberos « %s » : %s.\n"
+msgstr ""
+"Erreur lors de la récupération du nom principal Kerberos « %s » : %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : cette option requiert un argument -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : -- '%c' est une option invalide\n"
@@ -231,7 +244,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Erreur : l'argument supplémentaire « %s » est inutilisé.\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Erreur : des arguments supplémentaires inutilisés ont été fournis.\n"
@@ -239,32 +252,42 @@ msgstr "Erreur : des arguments supplémentaires inutilisés ont été fournis.\n
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
 msgid "Database location or nickname specified without the other.\n"
-msgstr "Un élément est manquant entre le nom de la base de données ou son nom.\n"
+msgstr ""
+"Un élément est manquant entre le nom de la base de données ou son nom.\n"
 
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
 msgid "Database directory and certificate file both specified.\n"
-msgstr "Le répertoire de la base de données et le fichier de certificat ont été spécifiés.\n"
+msgstr ""
+"Le répertoire de la base de données et le fichier de certificat ont été "
+"spécifiés.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Aucun répertoire de base de données, nom ou fichier de certificat n'ont été spécifiés.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Aucun répertoire de base de données, nom ou fichier de certificat n'ont été "
+"spécifiés.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "Les clés et les certificats ne peuvent être tous les deux enregistrés dans le même répertoire.\n"
+msgstr ""
+"Les clés et les certificats ne peuvent être tous les deux enregistrés dans "
+"le même répertoire.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Le backend IPA requiert l'utilisation de l'option -K (nom principal) si l'option -N (nom d'objet) est utilisée.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Le backend IPA requiert l'utilisation de l'option -K (nom principal) si "
+"l'option -N (nom d'objet) est utilisée.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Pas d'autorité de certification avec le nom « %s » trouvé.\n"
@@ -300,7 +323,9 @@ msgstr "La nouvelle demande de suivi n'a pas pu être ajoutée.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Aucun ID ou répertoire de base de données ni de nom ou fichier de certificat spécifié.\n"
+msgstr ""
+"Aucun ID ou répertoire de base de données ni de nom ou fichier de certificat "
+"spécifié.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -312,12 +337,12 @@ msgstr "Demande « %s » modifiée.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "La demande « %s » ne peux être modifiée.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Aucune demande trouvée avec le nom spécifié.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Aucune demande ne correspond aux arguments.\n"
@@ -357,605 +382,632 @@ msgstr "Erreur en tentant de soumettre « %s » à « %s ».\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Erreur en tentant de soumettre « %s ».\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Le numéro des certificats et les demandes qui seront suivis : %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID de la demande « %s » :\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tétat : %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\terreur-ac : %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tbloqué : %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tpaire de clés de stockage : modèle = « %s »"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "Aucun"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ", emplacement = « %s »"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ", nom = « %s »"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ", jeton = « %s »"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ", pin = « %s »"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ", fichier pin = « %s »"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertificat : modèle = « %s », emplacement = « %s »"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tAutorité de certification : %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\témetteur : %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tsujet : %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\texpiration : %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\te-mail : "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns : "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnom principal : "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "\tAdresse IP : "
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tusage de la clé : %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku : "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr "\tcertificats racine enregistrés sur fichiers :\n"
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr "\tautres certificats racine enregistrés sur fichiers :\n"
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr "\tautres certificats enregistrés sur fichiers :\n"
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr "\tcertificats racine enregistrés sur bases de données :\n"
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr "\tautres certificats racine enregistrés sur bases de données :\n"
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr "\tautres certificats enregistrés sur bases de données :\n"
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tcommande de pré-sauvegarde : %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tcommande de post-sauvegarde : %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tchemin : %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-renouvellement : %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "Autorité de certification « %s » :\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr "\tauto-identification en tant que : %s\n"
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\ttype-ac : %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\templacement-de-l'-aide : %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tprochain-numéros-de-série : %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnoms-des-problèmes-identifiés :\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr "\tprofils/modèles/types de certificats connus :\n"
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr "\tprofils/modèles/types de certificats par défaut : %s\n"
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr "\terreur lors du rafraîchissement des données du CA\n"
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - outil d'inscription du certificat client\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Utilisation : %s request [options]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Arguments requis :\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Si vous utilisez une base de données NSS pour le stockage :\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d RÉPERTOIRES\tNSS base de données pour les clés et certificats\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NOM\tsurnom pour le stockage NSS-base (valide uniquement avec -d)\n"
+msgstr ""
+"  -n NOM\tsurnom pour le stockage NSS-base (valide uniquement avec -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NOM\tnom de jeton optionel pour le stockage NSS-base (valide uniquement avec -d)\n"
+msgstr ""
+"  -t NOM\tnom de jeton optionel pour le stockage NSS-base (valide uniquement "
+"avec -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Si vous utilisez des fichiers de stockage :\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FICHIER\tPEM fichier pour une clé privée\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FICHIER\tPEM fichier du certificat (valide uniquement avec -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Si les clés sont à chiffrer :\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FICHIER\tfichier qui contient le code PIN de chiffrement\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tvaleur PIN\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Arguments optionnels :\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Paramètres de gestion du certificat :\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NOM\tnom à attribuer à la demande\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr "  -G TYPE\ttype de la clé à créer si aucune n'existe déjà\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g TAILLE\ttaille de la clé à générer si elle n'est pas déjà en place\n"
+msgstr ""
+"  -g TAILLE\ttaille de la clé à générer si elle n'est pas déjà en place\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\ttente de renouveler le certificat lorsque l'expiration approche (par défaut)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\ttente de renouveler le certificat lorsque l'expiration approche (par "
+"défaut)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tne pas tenter de renouveler le certificat lorsque l'expiration approche\n"
+msgstr ""
+"  -R\t\tne pas tenter de renouveler le certificat lorsque l'expiration "
+"approche\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
-msgstr "  -c AC\t\tutiliser l'autorité de certification spécifié, plutôt que celui par défaut\n"
+msgstr ""
+"  -c AC\t\tutiliser l'autorité de certification spécifié, plutôt que celui "
+"par défaut\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFIL\tinterroger le CA pour traiter la requête en utilisant le profil nommé ou le modèle\n"
+msgstr ""
+"  -T PROFIL\tinterroger le CA pour traiter la requête en utilisant le profil "
+"nommé ou le modèle\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Paramètres de la requête de signature :\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NOM\tdéfinit le nom du sujet demandé (par défaut: CN=<nom d'hôte>)\n"
+msgstr ""
+"  -N NOM\tdéfinit le nom du sujet demandé (par défaut: CN=<nom d'hôte>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tdéfinit l'étendu de l'utilisation d'une clé OID demandé\n"
+msgstr ""
+"  -U EXTUSAGE\tdéfinit l'étendu de l'utilisation d'une clé OID demandé\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u USAGECLÉ\tconfigure la valeur requise d'usage de la clé\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NOM\tdéfinit le nom principal demandé\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D NOMDNS\tdéfinit le nom DNS demandé\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\tdéfinit l'adresse e-mail demandé\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr "  -A ADRESSE\tdéfinit l'adresse IP demandée\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Options du Bus :\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tconnecte le service certmonger sur le bus système\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tconnecte le service certmonger sur le bus de session\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Autres options :\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tcommande à lancer avant de sauvegarder le certificat\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tcommande à lancer après avoir sauvegardé le certificat\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr "  -F\tfichier de stockage des certificats de CA\n"
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr "  -a\tbase de données NSS d'enregistrement des certificats de CA\n"
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\trapporte tous les détails des erreurs\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Utilisation : %s start-tracking [options]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Si vous modifiez une requête existante :\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NOM\tnom d'une demande de suivi existante\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Si les clés sont chiffrées :\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NOM\tnom à donner à la demande de suivi\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
-msgstr "* Paramètres de la requête de signature au moment du renouvellement :\n"
+msgstr ""
+"* Paramètres de la requête de signature au moment du renouvellement :\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\toutrepasse la requête d'utilisation d'une clé OID étendue\n"
+msgstr ""
+"  -U EXTUSAGE\toutrepasse la requête d'utilisation d'une clé OID étendue\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NOM\toutrepasse le nom principal demandé\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D NOMDNS\toutrepasse le nom DNS demandé\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\toutrepasse l'adresse e-mail demandée\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr "  -A ADRESSE\toutrepasse l'adresse IP demandée\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Utilisation : %s stop-tracking [options]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* En identifiant la demande :\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NOM\tnom pour suivre la demande\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Utilisation : %s resubmit [options]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FICHIER\tfichier PEM pour le certificat\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nouvelle valeur du paramètre pour la demande de signature :\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NOM\tnouveau nom à donner à la demande de suivi\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
-msgstr "  -c AC\t\tutilise l'autorité de certification spécifié plutôt que l'actuel\n"
+msgstr ""
+"  -c AC\t\tutilise l'autorité de certification spécifié plutôt que l'actuel\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Utilisation : %s list [options]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Options générales :\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c AC\tliste seulement les requêtes et les certificats associés à une autorité de certification\n"
+msgstr ""
+"  -c AC\tliste seulement les requêtes et les certificats associés à une "
+"autorité de certification\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tliste seulement l'information des demandes en attente\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tliste seulement l'information des certificats suivis\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Si vous sélectionnez une requête spécifique : \n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR\tn'afficher que les requêtes et certificats utilisant cette base de données NSS\n"
+msgstr ""
+"  -d DIR\tn'afficher que les requêtes et certificats utilisant cette base de "
+"données NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME\tn'afficher que les requêtes et certificats utilisant ce pseudo\n"
+msgstr ""
+"  -n NAME\tn'afficher que les requêtes et certificats utilisant ce pseudo\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE\tn'afficher que les requêtes et certificats stockés dans ce fichier PEM\n"
+msgstr ""
+"  -f FILE\tn'afficher que les requêtes et certificats stockés dans ce "
+"fichier PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tconnecte le service certmonger sur le bus système\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tconnecte le service certmonger sur le bus de session\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Utilisation : %s list-cas [options]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
-msgstr "  -c AC\tliste seulement les informations à propos de l'autorité de certification avec ce nom\n"
+msgstr ""
+"  -c AC\tliste seulement les informations à propos de l'autorité de "
+"certification avec ce nom\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr "Utilisation : %s refresh-ca [options]\n"
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr "  -c CA\trafraîchir l'information du CA de ce nom\n"
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s : commande inconnue\n"
@@ -978,36 +1030,48 @@ msgstr "L'option -K ne peut pas être utilisée avec les options -k ni -t.\n"
 #: src/ipa.c:238
 #, c-format
 msgid "Unable to determine principal name for signing request.\n"
-msgstr "Impossible de déterminer le nom principal pour la signature demandée.\n"
+msgstr ""
+"Impossible de déterminer le nom principal pour la signature demandée.\n"
 
 #: src/ipa.c:255
 #, c-format
 msgid "Unable to determine location of CA's XMLRPC server.\n"
-msgstr "Impossible de déterminer l'emplacement du serveur d'autorité de certification XMLRPC.\n"
+msgstr ""
+"Impossible de déterminer l'emplacement du serveur d'autorité de "
+"certification XMLRPC.\n"
 
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Erreur de mise en place du ccache pour le service « hôte » sur le client utilisant le jeu declés par défaut : %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Erreur de mise en place du ccache pour le service « hôte » sur le client "
+"utilisant le jeu declés par défaut : %s.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Erreur de mise en place du ccache pour « %s » sur le client en utilisant le jeu de clés par défaut : %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Erreur de mise en place du ccache pour « %s » sur le client en utilisant le "
+"jeu de clés par défaut : %s.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Erreur de mise en place du ccache pour le service « hôte » en utilisant le jeu de clés « %s » : %s.\n"
+msgstr ""
+"Erreur de mise en place du ccache pour le service « hôte » en utilisant le "
+"jeu de clés « %s » : %s.\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Erreur de mise en place du ccache pour « %s » sur le client en utilisant le jeu de  clés « %s » : %s.\n"
+msgstr ""
+"Erreur de mise en place du ccache pour « %s » sur le client en utilisant le "
+"jeu de  clés « %s » : %s.\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1022,7 +1086,9 @@ msgstr "Impossible de déterminer l'emplacement du serveur LDAP IPA.\n"
 #: src/ipa.c:490
 #, c-format
 msgid "Unable to determine base DN of domain information on IPA server.\n"
-msgstr "Impossible de déterminer le DN de base des informations de domaine sur le serveur IPA.\n"
+msgstr ""
+"Impossible de déterminer le DN de base des informations de domaine sur le "
+"serveur IPA.\n"
 
 #: src/main.c:120
 #, c-format
@@ -1065,7 +1131,7 @@ msgstr "\t-p FICHIER     écrire le PID du service dans un fichier\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         impose le mode FIPS à NSS\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Une erreur interne s'est produite."
 
@@ -1089,7 +1155,7 @@ msgstr "Le type de certificat « %s » n'est pas pris en charge."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "L'emplacement « %s » doit être un chemin absolu."
@@ -1104,7 +1170,9 @@ msgstr "Emplacement de stockage de certificat non spécifié."
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "L'emplacement parent de « %s » n'est pas accessible du fait de permissions insuffisantes."
+msgstr ""
+"L'emplacement parent de « %s » n'est pas accessible du fait de permissions "
+"insuffisantes."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1120,8 +1188,11 @@ msgstr "L'emplacement « %s » doit être un fichier."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
-msgstr "L'emplacement « %s » n'est pas accessible du fait de permissions insuffisantes."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
+msgstr ""
+"L'emplacement « %s » n'est pas accessible du fait de permissions "
+"insuffisantes."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
 #: src/tdbush.c:1145
@@ -1133,7 +1204,7 @@ msgstr "L'emplacement « %s » doit être un répertoire."
 msgid "Certificate nickname not specified."
 msgstr "Nom du certificat non spécifié."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Il existe déjà une demande avec le nom « %s »."
@@ -1141,8 +1212,7 @@ msgstr "Il existe déjà une demande avec le nom « %s »."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr "Le certificat est déjà utilisé par une requête avec le nom « %s »."
 
 #: src/tdbush.c:731
@@ -1172,26 +1242,27 @@ msgstr "Absence de prise en charge des clés de type « %s »."
 msgid "No such CA."
 msgstr "Aucune autorité de certification."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "L'autorité de certification « %s » non connue."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Paramètre inconnu ou type de valeur incorrecte."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Erreur lors de l'analyse des arguments."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Nom de propriété inconnu."
 
 #: src/tdbusm.c:1953
 msgid "Insufficient access.  Please retry operation as root.\n"
-msgstr "Accès insuffisant. Merci de recommencer l'opération en tant que root.\n"
+msgstr ""
+"Accès insuffisant. Merci de recommencer l'opération en tant que root.\n"
 
 #: src/tdbusm.c:1957
 msgid "Please verify that the certmonger service has been started.\n"
@@ -1199,4 +1270,6 @@ msgstr "Merci de vérifier que le service certmonger a été démarré.\n"
 
 #: src/tdbusm.c:1960
 msgid "Please verify that the certmonger service is still running.\n"
-msgstr "Merci de vérifier que le service certmonger est en cours d'exécution.\n\n"
+msgstr ""
+"Merci de vérifier que le service certmonger est en cours d'exécution.\n"
+"\n"
diff --git a/po/ga.po b/po/ga.po
index 6658d40..881dadf 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Irish (http://www.transifex.com/projects/p/certmonger/language/ga/)\n"
+"Language-Team: Irish (http://www.transifex.com/projects/p/certmonger/"
+"language/ga/)\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ga\n"
-"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index 682e3bd..3f594bb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/certmonger/language/gl/)\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/certmonger/"
+"language/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 956622a..a1bd93f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # sweta <swkothar@redhat.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Gujarati (http://www.transifex.com/projects/p/certmonger/language/gu/)\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/certmonger/"
+"language/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "XMLRPC માટે સુયોજિત કરતી વખતે ભ�
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "નામ \"%s\" સાથે CA મળ્યુ નથી.\n"
@@ -308,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tસ્થિતિ: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tવિષય: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "અજ્ઞાત"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tઇમેલ: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tટ્રેક: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "જરૂરી દલીલો:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN કિંમત\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "વૈકલ્પિક દલીલો:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* બસ વિકલ્પો:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Usage: %s list [options]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* સામાન્ય વિકલ્પો:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -984,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "આંતરિક ભૂલ ઉદ્ભવી."
 
@@ -1085,7 +1089,7 @@ msgstr "પ્રમાણપત્ર સંગ્રહ પ્રકાર \"%
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1120,8 @@ msgstr "સ્થાન \"%s\" ફાઇલ હોવી જ જોઇએ."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1134,7 @@ msgstr "સ્થાન \"%s\" ડિરેક્ટરી હોવી જ જ�
 msgid "Certificate nickname not specified."
 msgstr "પ્રમાણપત્ર ઉપનામ સ્પષ્ટ થયેલ નથી."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/he.po b/po/he.po
index 3938a4f..b5407ad 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/certmonger/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/certmonger/"
+"language/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 371674d..78b1114 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Hindi (http://www.transifex.com/projects/p/certmonger/language/hi/)\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/certmonger/"
+"language/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 1e0650c..2a1966a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/certmonger/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/certmonger/"
+"language/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 0aa654a..9bd8c96 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/"
@@ -37,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -228,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -262,7 +262,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -310,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -355,606 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1089,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1172,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index c4a11c9..65c91d8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Peter Borsa <peter.borsa@gmail.com>, 2012
 # Zoltan Hoppár <zoltanh721@fedoraproject.org>, 2012-2013
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/certmonger/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/certmonger/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -37,8 +38,8 @@ msgstr "Hiba történt a XMLRPC-re történő beállításkor\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Hiba a szerver válasz értelmezésében.\n"
@@ -56,7 +57,8 @@ msgstr ""
 #: src/dogtag.c:366
 #, c-format
 msgid "No end-entity URL (-E) given, and no default known.\n"
-msgstr "Nincs végentitású URL megadva (-E), és nincs ismert alapértelmezett sem.\n"
+msgstr ""
+"Nincs végentitású URL megadva (-E), és nincs ismert alapértelmezett sem.\n"
 
 #: src/dogtag.c:370
 #, c-format
@@ -66,7 +68,8 @@ msgstr "Nincs ágens URL megadva (-A), és nincs ismert alapértelmezett sem.\n"
 #: src/dogtag.c:374
 #, c-format
 msgid "No profile/template (-T) given, and no default known.\n"
-msgstr "Nincs profil / sablon megadva (-T), és nincs ismert alapértelmezett sem.\n"
+msgstr ""
+"Nincs profil / sablon megadva (-T), és nincs ismert alapértelmezett sem.\n"
 
 #: src/dogtag.c:382
 #, c-format
@@ -96,14 +99,18 @@ msgstr "Belső hiba: nincs válasz erre - \"%s?%s\".\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "\"%s\" elérési út nem abszolút, próbaként \"%s\" kerül alkalmazásra helyette.\n"
+msgstr ""
+"\"%s\" elérési út nem abszolút, próbaként \"%s\" kerül alkalmazásra "
+"helyette.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "\"%s\" elérési út nem abszolút, és hiba történt a jelenlegi könyvtár meghatározásakor.\n"
+msgstr ""
+"\"%s\" elérési út nem abszolút, és hiba történt a jelenlegi könyvtár "
+"meghatározásakor.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -153,7 +160,9 @@ msgstr "Hiba %s: %s\n"
 #: src/getcert.c:328
 #, c-format
 msgid "Error %s\n"
-msgstr "Hiba %s\n\n"
+msgstr ""
+"Hiba %s\n"
+"\n"
 
 #: src/getcert.c:334
 #, c-format
@@ -170,7 +179,7 @@ msgstr "Hiba érkezett egy helyi %s szolgáltatástól.\n"
 msgid "No response received from %s service.\n"
 msgstr "Nincs válasz a következő szolgáltatástól: %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +220,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Hiba a Kerberos megbízói név visszafordításakor \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: az opcióhoz szükséges egy paraméter is -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen opció --'%c'\n"
@@ -228,7 +237,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "HIba: kihasználatlan extra paraméter \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Hiba: használaton kívüli extra paraméterek is alkalmazásra kerültek.\n"
@@ -245,8 +254,11 @@ msgstr "Adatbázis könyvtára és az aláírás fájl meghatározva.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Sem az adatbázis könyvtára és az elnevezése, vagy az aláírás fájl nincs meghatározva.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Sem az adatbázis könyvtára és az elnevezése, vagy az aláírás fájl nincs "
+"meghatározva.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -256,12 +268,14 @@ msgstr "A kulcs és az aláírás nem menthető el egy ugyanazon fájlba.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Az IPA backend-nek szükséges a -K opció (megbízói név) ha az -N opció (tárgy név) alkalmazásban van.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Az IPA backend-nek szükséges a -K opció (megbízói név) ha az -N opció (tárgy "
+"név) alkalmazásban van.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Nincs elérhető CA \"%s\" néven.\n"
@@ -297,7 +311,9 @@ msgstr "Új nyomkövetési kérés nem adható hozzá.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Sem az ID vagy adatbázis könyvtára és az elnevezése, vagy az aláírás fájl sincsen meghatározva.\n"
+msgstr ""
+"Sem az ID vagy adatbázis könyvtára és az elnevezése, vagy az aláírás fájl "
+"sincsen meghatározva.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -309,12 +325,12 @@ msgstr "\"%s\" kérés módosult.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "\"%s\" kérés nem módosítható.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Nem található kérés a megadott elnevezéssel.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Olyan kérés nem található ami egyezne a paraméterekkel.\n"
@@ -354,608 +370,661 @@ msgstr "Nem sikerült \"%s\" beküldése ide: \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "\"%s\" beküldése sikertelen.\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "A nyomonkövetett kérések és aláírások száma: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID kérése: '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>status: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-error: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>beragadt: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tkulcspár tároló: típusa=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NINCS"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",helye='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",elnevezés='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",jegy='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfájl='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\ttanusítvány: típusa=%s,helye='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>issuer: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>subject: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>lejárati idő: %s\n"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>lejárati idő: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>email: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>dns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>megbízó neve: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tkulcshasználat: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>eku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tpre-mentés parancs: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tpost-mentés parancs: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>track: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>automatikus megújítás: %s\n"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>automatikus "
+"megújítás: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-típus: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>segítő-helye: %s\n"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>segítő-helye: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>következő sorozatszám: %s\n"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>következő "
+"sorozatszám: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
-msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ismert kibocsátó nevek:\n"
+msgstr ""
+"<span class=\"whitespace other\" title=\"Tab\">»</span>ismert kibocsátó "
+"nevek:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - kliens tanusítvány felvevő eszköz\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Használata: %s kérés [opciók]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Szükséges paraméterek:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
-msgstr "* Ha egy NSS adatbázist használ a tárolóhoz:\n\n"
+msgstr ""
+"* Ha egy NSS adatbázist használ a tárolóhoz:\n"
+"\n"
+
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
+msgid "  -d DIR\tNSS database for key and cert\n"
+msgstr ""
+"  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span>NSS adatbázis "
+"a kulcshoz és a tanusítványhoz\n"
 
 #: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
 #: src/getcert.c:3519
-msgid "  -d DIR\tNSS database for key and cert\n"
-msgstr "  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span>NSS adatbázis a kulcshoz és a tanusítványhoz\n"
+msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
+msgstr ""
+"  -n NAME<span class=\"whitespace other\" title=\"Tab\">»</span>elnevezés az "
+"NSS-alapú tárolóhoz (csak -d opcióval érvényes)\n"
 
 #: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
 #: src/getcert.c:3520
-msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAME<span class=\"whitespace other\" title=\"Tab\">»</span>elnevezés az NSS-alapú tárolóhoz (csak -d opcióval érvényes)\n"
-
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAME\topcionális token név az NSS-alapú tárolókhoz (csak a -d opcióval érvényes)\n"
+msgstr ""
+"  -t NAME\topcionális token név az NSS-alapú tárolókhoz (csak a -d opcióval "
+"érvényes)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Ha a fájlokat a tárolásra használja:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE\tPEM fájl a privát kulcshoz\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE\tPEM fájl az aláíráshoz (csak a -k opcióval érvényes)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Ha a kulcsok titkosításra kerülnek:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE\tfájl ami a titkosító PIN-t tartalmazza\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN értéke\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Opcionális paraméterek:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Aláírás ezeket a beállításokat kezeli:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME\telnevezés amelyet hozzárendelhetünk az igényléshez\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g SIZE\taz előállítandó kulcs mérete ha egy már nem lenne a helyén\n\n"
+msgstr ""
+"  -g SIZE\taz előállítandó kulcs mérete ha egy már nem lenne a helyén\n"
+"\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tmegkísérlés a bizonyítvány megújítására ha a lejárati idő közeledik (alapértelmezett)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tmegkísérlés a bizonyítvány megújítására ha a lejárati idő közeledik "
+"(alapértelmezett)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tne kísérelje meg a bizonyítvány megújítását ha a lejárati idő közeledik\n"
+msgstr ""
+"  -R\t\tne kísérelje meg a bizonyítvány megújítását ha a lejárati idő "
+"közeledik\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
-msgstr "  -c CA\t\tinkább alkalmazza a megadott CA mint az alapértelmezettet\n\n"
+msgstr ""
+"  -c CA\t\tinkább alkalmazza a megadott CA mint az alapértelmezettet\n"
+"\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\task CA számítás a kért felhasznált profil név vagy sablon\n"
+msgstr ""
+"  -T PROFILE\task CA számítás a kért felhasznált profil név vagy sablon\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Paraméterek az aláírási igényléshez:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME \tigényelt tárgy nevének beállítása (alapértelmezett: CN=<hosztnév>)\n"
+msgstr ""
+"  -N NAME \tigényelt tárgy nevének beállítása (alapértelmezett: "
+"CN=<hosztnév>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tigényelt kibővített kulcs használatának beállítása OID\n"
+msgstr ""
+"  -U EXTUSAGE\tigényelt kibővített kulcs használatának beállítása OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\tbeállítja a kért kulcshasználati értéket\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "-K NAME\tigényelt elsődleges név beállítása \n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "- D DNSNAME\tigényelt DNS név beállítása\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "-E MAIL \tigényelt email cím beállítása\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Adatcsatorna opciók:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "-S\t\tconnect certmonger szolgáltatásnál a rendszer buszon \n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "-s\t\tconnect certmonger szolgáltatásnál a szál vezérélésnél \n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Egyéb opciók:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "-B\tcommand futtatás előtt a tanúsítványt menti \n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "-C\tcommand futtatás után a tanúsítványt menti \n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\tjelentse az összes hibarészletet\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Használata: %s nyomon követés [opciók]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Ha módosítanak egy létező kérést:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME\tnickname of an existing tracking request\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Ha a kulcsok titkosítottak:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME\telnevezés a nyomonkövetési kéréshez\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
-msgstr "* Paraméterek az aláírási kéréshez megújításkor:\n\n"
+msgstr ""
+"* Paraméterek az aláírási kéréshez megújításkor:\n"
+"\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\tfelülírja a kért kibővített kulcs használat OID-jét\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
-msgstr "  -K NAME\tfelülírja a kért elsődleges nevet\n\n"
+msgstr ""
+"  -K NAME\tfelülírja a kért elsődleges nevet\n"
+"\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\tfelülírja a kért DNS nevet\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
-msgstr "  -E EMAIL\tfelülírja a kért email címet\n\n"
+msgstr ""
+"  -E EMAIL\tfelülírja a kért email címet\n"
+"\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Használata: %s stop-tracking [opciók]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Kérés azonosítója alapján:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME\telnevezés a nyomonkövetési kéréshez\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Használata: %s újraküldése [opciók]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE\tPEM fájl az aláírásért\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Új paraméter értékek az aláírási kérelemhez:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\túj név megadása a nyomonkövetési kéréshez\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\talkalmazza a megadott CA-t jelenlegi helyett \n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Használata: %s listázása [opciók]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Általános opciók:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tcsak azokat a kéréseket és bizonytványokat listázza amelyek ezzel a CA-val vannak kapcsolatban\n"
+msgstr ""
+"  -c CA\tcsak azokat a kéréseket és bizonytványokat listázza amelyek ezzel a "
+"CA-val vannak kapcsolatban\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tcsak a kiemelkedő kérésekről szóló információkat listázza\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
-msgstr "  -t\tcsak a nyomonkövetett bizonytványok adatait listázza\n\n"
+msgstr ""
+"  -t\tcsak a nyomonkövetett bizonytványok adatait listázza\n"
+"\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Ha kiválaszt egy specifikus igénylést:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR\tcsak olyan igényléseket és bizonyítványokat listáz amelyek ezt az NSS adatbázist használják\n"
+msgstr ""
+"  -d DIR\tcsak olyan igényléseket és bizonyítványokat listáz amelyek ezt az "
+"NSS adatbázist használják\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME\tcsak olyan igényléseket és bizonyítványokat listáz amelyek ezt az elnevezést használják\n\n"
+msgstr ""
+"  -n NAME\tcsak olyan igényléseket és bizonyítványokat listáz amelyek ezt az "
+"elnevezést használják\n"
+"\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE\tcsak olyan igényléseket és bizonyítványokat listáz amelyek tárolásra kerültek ebben a PEM fájlban\n\n"
+msgstr ""
+"  -f FILE\tcsak olyan igényléseket és bizonyítványokat listáz amelyek "
+"tárolásra kerültek ebben a PEM fájlban\n"
+"\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tkapcsolja össze a certmonger szolgáltatást a rendszer bus-al\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s\tkapcsolja össze a certmonger szolgáltatást a session bus-al\n\n"
+msgstr ""
+"  -s\tkapcsolja össze a certmonger szolgáltatást a session bus-al\n"
+"\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Alkalmazás: %s list-cas [opciók]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
-msgstr "  -c CA\tcsak az ezzel a névvel rendelkező CA tanúsítvány információit listázza\n"
+msgstr ""
+"  -c CA\tcsak az ezzel a névvel rendelkező CA tanúsítvány információit "
+"listázza\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
-msgstr "%s: ismeretlen parancs\n\n"
+msgstr ""
+"%s: ismeretlen parancs\n"
+"\n"
 
 #: src/ipa.c:151
 #, c-format
@@ -985,13 +1054,14 @@ msgstr "Nem meghatározható a CA XMLRPC kiszolgáló helye.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1032,7 +1102,9 @@ msgstr "\t-s         szálvezérlés használata\n"
 
 #: src/main.c:125
 msgid "\t-S         use system bus\n"
-msgstr "\t-S         rendszerbusz használata\n\n"
+msgstr ""
+"\t-S         rendszerbusz használata\n"
+"\n"
 
 #: src/main.c:126
 msgid "\t-n         don't become a daemon\n"
@@ -1044,11 +1116,15 @@ msgstr "\t-f         művelet váljon daemonná\n"
 
 #: src/main.c:128
 msgid "\t-b TIMEOUT bus-activated, idle timeout\n"
-msgstr "\t-b TIMEOUT busz-vezérelt, várakozási idővel\n\n"
+msgstr ""
+"\t-b TIMEOUT busz-vezérelt, várakozási idővel\n"
+"\n"
 
 #: src/main.c:129
 msgid "\t-B         don't use an idle timeout\n"
-msgstr "\t-B         várakozási idő elhagyása\n\n"
+msgstr ""
+"\t-B         várakozási idő elhagyása\n"
+"\n"
 
 #: src/main.c:130
 msgid "\t-d LEVEL   set debugging level (implies -n)\n"
@@ -1056,13 +1132,15 @@ msgstr "\t-d LEVEL   hibakeresési szint beállítása (ez azt jelenti: -n)\n"
 
 #: src/main.c:131
 msgid "\t-p FILE    write service PID to file\n"
-msgstr "\t-p FILE    szolgáltatás PID rögzítése fájlba\n\n"
+msgstr ""
+"\t-p FILE    szolgáltatás PID rögzítése fájlba\n"
+"\n"
 
 #: src/main.c:132
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         eröltesse az NSS-t FIPS módba\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Belső hiba történt."
 
@@ -1086,7 +1164,7 @@ msgstr "\"%s\" típusú bizonyítványtároló enm támogatott."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "A hely \"%s\" abszolút elérési útnak kell lennie."
@@ -1117,7 +1195,8 @@ msgstr "\"%s\" egy fájlnak kell lennie."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1130,7 +1209,7 @@ msgstr "\"%s\" egy könyvtárnak kell lennie."
 msgid "Certificate nickname not specified."
 msgstr "Bizonyítvány elnevezése nincs definiálva."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Már van egy igénylés ezzel a névvel: \"%s\"."
@@ -1138,9 +1217,9 @@ msgstr "Már van egy igénylés ezzel a névvel: \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Tanúsítvány ugyanazt a helyet használja amit a becenévnél igényelt \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Tanúsítvány ugyanazt a helyet használja amit a becenévnél igényelt \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1169,26 +1248,28 @@ msgstr ""
 msgid "No such CA."
 msgstr "Nincs ilyen CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "\"%s\" nevű tanúsítvány hatóság nem ismert."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Ismeretlen paraméter, vagy rossz értéktípus."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
 #: src/tdbusm.c:1953
 msgid "Insufficient access.  Please retry operation as root.\n"
-msgstr "Elégtelen hozzáférési jog. Kérem ismételje meg a műveletet rendszergazdaként.\n"
+msgstr ""
+"Elégtelen hozzáférési jog. Kérem ismételje meg a műveletet "
+"rendszergazdaként.\n"
 
 #: src/tdbusm.c:1957
 msgid "Please verify that the certmonger service has been started.\n"
diff --git a/po/hy.po b/po/hy.po
index 88bd22f..e0cc3b3 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/certmonger/language/hy/)\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/certmonger/"
+"language/hy/)\n"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ia.po b/po/ia.po
index bab5da4..d0de35d 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Interlingua (http://www.transifex.com/projects/p/certmonger/language/ia/)\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/certmonger/"
+"language/ia/)\n"
+"Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 6ad9f94..f05908f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Nalin Dahyabhai <nalin@fedoraproject.org>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/certmonger/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/certmonger/"
+"language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "Setting kesalahan untuk XMLRPC\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "merespon pelayanan penguraian kesalahan.\n"
@@ -102,7 +103,9 @@ msgstr ""
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Path \"%s\"tidak mutlak, dan ada eror yang menentukan nama dari sebuah direktori.\n"
+msgstr ""
+"Path \"%s\"tidak mutlak, dan ada eror yang menentukan nama dari sebuah "
+"direktori.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -169,7 +172,7 @@ msgstr "Menerima respon eror dari lokal %s layanan.\n"
 msgid "No response received from %s service.\n"
 msgstr "Tidak menerima respon dari %s layanan.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +213,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Kesalahan tanpa menguraikan nama utama Kerberos \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +230,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,23 +247,29 @@ msgstr "Direktori database dan sertifikat file kedua secara khusus.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Tidak ada dari direktori database dan nama panggilan atau sertifikat berkas khusus.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Tidak ada dari direktori database dan nama panggilan atau sertifikat berkas "
+"khusus.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "Kunci dan sertifikat tidak dapat di simpan seluruhnya pada file yang sama.\n"
+msgstr ""
+"Kunci dan sertifikat tidak dapat di simpan seluruhnya pada file yang sama.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "IPA kembali memerlukan kegunaan dari pilihan -K (nama utama) di mana ketika pilihan -N (nama subjek) telah digunakan.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"IPA kembali memerlukan kegunaan dari pilihan -K (nama utama) di mana ketika "
+"pilihan -N (nama subjek) telah digunakan.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Tidak ada CA dengan nama \"%s\"menemukan.\n"
@@ -296,7 +305,9 @@ msgstr "Permintaan pelacakan tidak dapat di tambahkan.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "ID kosong atau direktori database dan nama panggilan atau sertifikat berkas khusus.\n"
+msgstr ""
+"ID kosong atau direktori database dan nama panggilan atau sertifikat berkas "
+"khusus.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -308,12 +319,12 @@ msgstr "Permintaan \"%s\" memodifikasi.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Permintaan \"%s\" tidak dapat dimodifikasi.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Tidak menemukan permintaan mengenai argumen yang cocok.\n"
@@ -353,605 +364,614 @@ msgstr "Usaha eror untuk di ajukan \"%s\"untuk \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Usaha eror untuk di ajukan \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID de solicitud '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tstatus: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-error: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tstuck: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tissuer: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tsubject: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\texpires: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "Tidak diketauhui"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\temail: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tprincipal name: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttrack: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-renew: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "AC '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-type: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\thelper-location: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tnext-serial-number: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tknown-issuer-names:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - sertifikat pendaftaran pelanggan\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Pemakaian: %s request[options]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Argumentasi yang di butuhkan:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "*Jika menggunakan database NSS untuk menyimpan:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "-d DIR\tNSS database untuk kunci dan pemastian\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "-n NAME\tnickname untuk dasar penyimpanan NSS (hanya valid dengan -d)\n"
+msgstr ""
+"-n NAME\tnickname untuk dasar penyimpanan NSS (hanya valid dengan -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "-t NAME\toptional tanda nama untuk dasar penyimpanan NSS (hanya valid dengan -d)\n"
+msgstr ""
+"-t NAME\toptional tanda nama untuk dasar penyimpanan NSS (hanya valid dengan "
+"-d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "*Jika menggunakan berkas untuk penyimpanan:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "-k FILE\tPEM berkas untuk kunci privasi\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "-f FILE\tPEM berkas untuk sertifikat (hanya valid dengan -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "-p FILE\tfile yang memegang enkripsi suatu PIN\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Pilihan argumen-argumen:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Keadaan menangani sertifikat:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "-I NAME\tnickname untuk menandai sebuah permintaan\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "-g SIZE\tsize  sebuah kunci untuk menghasilkan jika salah satu telah tidak berada di dalam tempat\n"
+msgstr ""
+"-g SIZE\tsize  sebuah kunci untuk menghasilkan jika salah satu telah tidak "
+"berada di dalam tempat\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "-r\t\tattempt untuk memperbarui sertifikat ketika mendekati akhir waktu (kegagalan)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"-r\t\tattempt untuk memperbarui sertifikat ketika mendekati akhir waktu "
+"(kegagalan)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "-R\t\tdon't usaha untuk memperbarui sertifikat ketika mendekati akhir waktu\n"
+msgstr ""
+"-R\t\tdon't usaha untuk memperbarui sertifikat ketika mendekati akhir waktu\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr " -c CA\t\tuse CA khusus lebih baik daripada kegagalan\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Beberapa parameter untuk menandai permintaan:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N NAME\tset permintaan nama subjek (kegagalan: CN=<hostname>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "-U EXTUSAGE\tset memperluas permintaan pemakaian kunci OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "-K NAME\tset permintaan nama utama\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "-D DNSNAME\tset permintaan nama DNS\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "-E EMAIL\tset permintaan alamat email\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Pilihan Bus:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "-S\t\tconnect untuk layanan pemastian dalam sistem bus\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "-s\t\tconnect untuk layanan pemastian pada pembahasan bus\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Pemakaian: %s start-tracking [options]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Jika memodifikasi permintaan yang ada:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "-i NAME\tnickname permintaan mengikuti jalan yang ada\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Jika kunci adalah enkripsi:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "-I NAME\tnickname untuk memberi mengikuti permintaan\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Pemakaian:  %s stop-tracking [options]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Dengan memperkenalkan permintaan:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "-i NAME\tnickname untuk mengikuti permintaan\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Pemakaian: %s resubmit [options]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "-f FILE\tPEM berkas untuk sertifikat\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Parameter baru bernilai untuk menandai permintaan:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "-I NAME\tnew nama panggilan untuk memberikan mengikuti permintaan\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "-c CA\t\tuse CA khusus lebih baik daripada saat ini\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Pemakaian:  %s list [options]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Pilihan umum:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "-c CA\tlist hanya permintaan dan pemastian kolega dengan CA ini\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "-r\tlist hanya informasi tentang permintaan terkemuka\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "-t\tlist hanya informasi tentang jalannya sertifikat\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "-S\tconnect untuk layanan pemastian pada sistem bus\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "-s\tconnect untuk layanan pemastian pada pembahasan bus\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Pemakaian: %s list-cas [options]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "-c CA\tlist hanya informasi tentang CA dengan nama ini\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: tidak mengenali perintah\n"
@@ -984,13 +1004,14 @@ msgstr "Tidak dapat untuk menentukan lokasi dari penyedia CA XMLRPC.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1082,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Eror pada bagian dalam telah terjadi"
 
@@ -1085,7 +1106,7 @@ msgstr "Tipe penyimpanan sertifikat \"%s\" tidak mendukung."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Lokasi \"%s\" harus analisa yang tepat."
@@ -1116,7 +1137,8 @@ msgstr "Lokasi \"%s\" harus berupa berkas."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1151,7 @@ msgstr "Lokasi \"%s\" harus berupa direktori."
 msgid "Certificate nickname not specified."
 msgstr "nama panggilan sertifikat tidak khusus."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Permintaan telah dilakukan dengan nama panggilan \"%s\"."
@@ -1137,8 +1159,7 @@ msgstr "Permintaan telah dilakukan dengan nama panggilan \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1189,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "CA tidak serupa."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Wewenang sertifikat \"%s\" tidak diketahui."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Tidak mengenal parameter atau salah tipe nilai."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ilo.po b/po/ilo.po
index b1bce7f..ae4fa67 100644
--- a/po/ilo.po
+++ b/po/ilo.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Iloko (http://www.transifex.com/projects/p/certmonger/language/ilo/)\n"
+"Language-Team: Iloko (http://www.transifex.com/projects/p/certmonger/"
+"language/ilo/)\n"
+"Language: ilo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ilo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 5cc1190..2d43172 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Icelandic (http://www.transifex.com/projects/p/certmonger/language/is/)\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/certmonger/"
+"language/is/)\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 76c7f26..ed8c9f5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Mario Santagiuliana <fedora at marionline.it>, 2012
 # Silvio Pierro <perplesso82@gmail.com>, 2012
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/certmonger/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/certmonger/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -37,8 +38,8 @@ msgstr "Errore nell'impostazione di XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Errore di analisi della risposta del server.\n"
@@ -96,14 +97,17 @@ msgstr ""
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Il percorso \"%s\" non è assoluto, tentativo di usare \"%s\" al suo posto.\n"
+msgstr ""
+"Il percorso \"%s\" non è assoluto, tentativo di usare \"%s\" al suo posto.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Il percorso \"%s\" non è assoluto, e si è verificato un errore nella determinazione del nome della cartella attuale.\n"
+msgstr ""
+"Il percorso \"%s\" non è assoluto, e si è verificato un errore nella "
+"determinazione del nome della cartella attuale.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -170,7 +174,7 @@ msgstr "Ricevuta una risposta di errore dal servizio locale %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Nessuna risposta ricevuta dal servizio %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +215,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Errore non analizzato nome principale Kerberos \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l'opzione richiede un argomento -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opzione non valida -- '%c'\n"
@@ -228,7 +232,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Errore: argomento extra \"%s\" non usato.\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Errore: argomenti extra non usati dove forniti.\n"
@@ -245,23 +249,30 @@ msgstr "Cartella database e file certificato specificati contemporaneamente.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Non è stata specificata nessuna cartella di database e nickname o file certificato.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Non è stata specificata nessuna cartella di database e nickname o file "
+"certificato.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "La chiave ed il certificato non possono essere salvati entrambi nello stesso file.\n"
+msgstr ""
+"La chiave ed il certificato non possono essere salvati entrambi nello stesso "
+"file.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Il backend IPA richiede l'uso dell'opzione -K (nome principale) quando si usa l'opzione -N (nome soggetto).\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Il backend IPA richiede l'uso dell'opzione -K (nome principale) quando si "
+"usa l'opzione -N (nome soggetto).\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Non è stato trovato nessun CA con nome \"%s\".\n"
@@ -297,7 +308,9 @@ msgstr "La nuova richiesta di tracking non può essere aggiunta.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Non è stato specificato nessuno tra l'ID oppure la cartella di database ed il nickname oppure il certificato.\n"
+msgstr ""
+"Non è stato specificato nessuno tra l'ID oppure la cartella di database ed "
+"il nickname oppure il certificato.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -309,12 +322,12 @@ msgstr "Richiesta \"%s\" modificata.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "La richiesta \"%s\" non può essere modificata.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Non è stata trovata nessuna richiesta con il nickname specificato.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Non è stata trovata nessuna richiesta con argomenti corrispondenti.\n"
@@ -354,605 +367,622 @@ msgstr "Errore nel tentativo di sottomettere \"%s\" a \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Errore nel tentativo di sottomettere \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Il numero di certificati e di richieste sotto tracciamento: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID richiesto '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tstato: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\terrore-ca: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tstuck: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tcoppia chiavi di storage: tipo=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NESSUNO"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",posizione='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",nickname='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfile='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertificato: tipo=%s,posizione='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\temittente: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tsoggetto: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tscadenza: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\temail:"
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnome principale:"
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttraccia: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-renew: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\ttipo-ca: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tposizione-aiutante: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tprossimo-numero-serie: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnomi-emittente-noti:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - strumento di registrazione certificato client\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Utilizzo: %s request [opzioni]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Argomenti richiesti:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Se si utilizza un database NSS per lo storage:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tDatabase NSS per chiave e certificato\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NOME\tnickname per gli storage basati su NSS (valido solo con -d)\n"
+msgstr ""
+"  -n NOME\tnickname per gli storage basati su NSS (valido solo con -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NOME\tnome token opzionale per storage basato su NSS (valido solo con -d)\n"
+msgstr ""
+"  -t NOME\tnome token opzionale per storage basato su NSS (valido solo con -"
+"d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Se si utilizzano file per lo storage:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE\tfile PEM per la chiave privata\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE\tfile PEM per il certificato (valido solo con -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Se le chiavi devono essere cifrate:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE\til file che contiene il PIN di cifratura\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tvalore PIN\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Argomenti aggiuntivi:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Impostazioni di gestione certificato:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NOME\tnickname da assegnare alla richiesta\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g DIM\tdimensione della chiave da generare se non ne è già presente una\n"
+msgstr ""
+"  -g DIM\tdimensione della chiave da generare se non ne è già presente una\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\ttenta di rinnovare il certificato quando si avvicina la scadenza (predefinito)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\ttenta di rinnovare il certificato quando si avvicina la scadenza "
+"(predefinito)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -r\t\tnon tentare di rinnovare il certificato quando si avvicina la scadenza\n"
+msgstr ""
+"  -r\t\tnon tentare di rinnovare il certificato quando si avvicina la "
+"scadenza\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tusa il CA specificato piuttosto che il predefinito\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parametri per la richiesta segnata:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N NOME\timposta il nome del soggetto (predefinito: CN=<hostname>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U USOEXT\timposta l'utilizzo OID della chiave estesa richiesta\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NOME\timposta il nome principale richiesto\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D NOMEDNS\timposta il nome DNS richiesto\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\timposta l'indirizzo email richiesto\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Opzioni bus:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tconnessione al servizio certmonger sul bus di sistema\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -S\t\tconnessione al servizio certmonger sul bus di sessione\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Altre opzioni:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\triporta tutti i dettagli degli errori\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Utilizzo: %s start-tracking [opzioni]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Se si modifica una richiesta preesistente:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NOME\tnickname di una richiesta di tracking preesistente\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Se le chiavi sono cifrate:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NOME\tnickname da dare alla richiesta di tracking\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parametri per la richiesta segnante al momento del rinnovo:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U USOEXT\tSovrascrive l'utilizzo OID della chiave estesa richiesta\n"
+msgstr ""
+"  -U USOEXT\tSovrascrive l'utilizzo OID della chiave estesa richiesta\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NOME\tsovrascrive il nome principale richiesto\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D NOMEDNS\tsovrascrive il nome DNS richiesto\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\tsovrascrive l'indirizzo email richiesto\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Utilizzo: %s stop-tracking [opzioni]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Per richieste di identificazione:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NOME\tnickname di una richiesta di tracking\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Utilizzo: %s resubmit [opzioni]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE\tfile PEM per il certificato\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nuovi valori di parametro per le richieste segnanti:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\tnuovo nickname da dare alla richiesta di tracking\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tusa il CA specificato piuttosto che l'attuale\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Utilizzo: %s list [opzioni]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Opzioni generali:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\telenca solo le richieste ed i certificati associati a questo CA\n"
+msgstr ""
+"  -c CA\telenca solo le richieste ed i certificati associati a questo CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\telenca solo le informazioni sulle richieste eccezionali\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\telenca solo le informazioni sui certificati tracciati\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Se si seleziona una richiesta specifica:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR\telenca solo le richieste ed i certificati che usano questo database NSS\n"
+msgstr ""
+"  -d DIR\telenca solo le richieste ed i certificati che usano questo "
+"database NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NOME\telenca solo le richieste ed i certificati che usano questo nickname\n"
+msgstr ""
+"  -n NOME\telenca solo le richieste ed i certificati che usano questo "
+"nickname\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE\telenca solo le richieste ed i certificati immagazzinati in questo file PEM\n"
+msgstr ""
+"  -f FILE\telenca solo le richieste ed i certificati immagazzinati in questo "
+"file PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tconnettersi al servizio certmonger sul bus di sistema\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tconnettersi al servizio certmonger sul bus di sessione\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Utilizzo: %s list-cas [opzioni]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\telenca solo informazioni sulla CA con questo nome\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: comando non riconosciuto\n"
@@ -970,12 +1000,15 @@ msgstr "L'opzione -k non può essere usata con l'opzione -K .\n"
 #: src/ipa.c:167
 #, c-format
 msgid "The -K option can not be used with either the -k or the -t option.\n"
-msgstr "L'opzione -K non può essere usata ne con l'opzione -k che con l'opzione -t .\n"
+msgstr ""
+"L'opzione -K non può essere usata ne con l'opzione -k che con l'opzione -"
+"t .\n"
 
 #: src/ipa.c:238
 #, c-format
 msgid "Unable to determine principal name for signing request.\n"
-msgstr "Impossibile determinare il nome principale per la richiesta di firma.\n"
+msgstr ""
+"Impossibile determinare il nome principale per la richiesta di firma.\n"
 
 #: src/ipa.c:255
 #, c-format
@@ -985,13 +1018,14 @@ msgstr "Impossibile determinare la posizione del server XMLRPC di CA.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1062,7 +1096,7 @@ msgstr "\t-p FILE    scrive il PID di servizio su file\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Si è verificato un errore interno."
 
@@ -1086,7 +1120,7 @@ msgstr "Tipo di storage di certificato \"%s\" non supportato."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "La posizione \"%s\" deve essere un percorso assoluto."
@@ -1107,7 +1141,9 @@ msgstr ""
 #: src/tdbush.c:1190
 #, c-format
 msgid "The parent of location \"%s\" must be a valid directory."
-msgstr "La directory superiore della posizione \"%s\" deve essere una cartella valida."
+msgstr ""
+"La directory superiore della posizione \"%s\" deve essere una cartella "
+"valida."
 
 #: src/tdbush.c:550 src/tdbush.c:794 src/tdbush.c:1001 src/tdbush.c:1101
 #: src/tdbush.c:1201
@@ -1117,7 +1153,8 @@ msgstr "La posizione \"%s\" deve essere un file."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1130,7 +1167,7 @@ msgstr "La posizione \"%s\" deve essere una cartella."
 msgid "Certificate nickname not specified."
 msgstr "Nickname del certificato non specificato."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "E' già presente una richiesta con il nickname \"%s\"."
@@ -1138,9 +1175,10 @@ msgstr "E' già presente una richiesta con il nickname \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Il certificato con questa posizione è già usato dalla richiesta con il nickname \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Il certificato con questa posizione è già usato dalla richiesta con il "
+"nickname \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1158,7 +1196,9 @@ msgstr "Nickname di chiave non specificata."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "La chiave con questa posizione è già usata dalla richiesta con il nickname \"%s\"."
+msgstr ""
+"La chiave con questa posizione è già usata dalla richiesta con il nickname "
+"\"%s\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1169,20 +1209,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "Nessuna CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Autorità di certificato \"%s\" sconosciuta."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Parametro non riconosciuto o tipo di valore errato."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 5f4a35e..0911671 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 184ba06..5eddc46 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # carrotsoft <www.carrotsoft@gmail.com>, 2011
 # Hajime Taira <htaira@redhat.com>, 2011-2012
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/certmonger/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/certmonger/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -42,8 +43,8 @@ msgstr "XMLRPC の設定中にエラーが発生しました。\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "サーバーの応答を解析中にエラーが発生しました。\n"
@@ -61,17 +62,22 @@ msgstr ""
 #: src/dogtag.c:366
 #, c-format
 msgid "No end-entity URL (-E) given, and no default known.\n"
-msgstr "エンド・エンティティ URL (-E) が指定されていません。また、デフォルトが不明です。\n"
+msgstr ""
+"エンド・エンティティ URL (-E) が指定されていません。また、デフォルトが不明で"
+"す。\n"
 
 #: src/dogtag.c:370
 #, c-format
 msgid "No agent URL (-A) given, and no default known.\n"
-msgstr "エージェント URL (-A) が指定されていません。また、デフォルトが不明です。\n"
+msgstr ""
+"エージェント URL (-A) が指定されていません。また、デフォルトが不明です。\n"
 
 #: src/dogtag.c:374
 #, c-format
 msgid "No profile/template (-T) given, and no default known.\n"
-msgstr "プロファイル/テンプレート (-T) が指定されていません。また、デフォルトが不明です。\n"
+msgstr ""
+"プロファイル/テンプレート (-T) が指定されていません。また、デフォルトが不明で"
+"す。\n"
 
 #: src/dogtag.c:382
 #, c-format
@@ -86,12 +92,12 @@ msgstr "内部エラー: 未知の状態。\n"
 #: src/dogtag.c:570
 #, c-format
 msgid "Error %d connecting to %s: %s.\n"
-msgstr "%s: %s に接続中にエラー %d が発生しました。\n"
+msgstr "Error %d connecting to %s: %s.\n"
 
 #: src/dogtag.c:575
 #, c-format
 msgid "Error %d connecting to %s.\n"
-msgstr "%s に接続中にエラー %d が発生しました。\n"
+msgstr "Error %d connecting to %s.\n"
 
 #: src/dogtag.c:582
 #, c-format
@@ -101,14 +107,17 @@ msgstr "内部エラー: \"%s?%s\" への応答がありません。\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "パス \"%s\" が絶対パスではありません。代わりに \"%s\" で試行しています。\n"
+msgstr ""
+"パス \"%s\" が絶対パスではありません。代わりに \"%s\" で試行しています。\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "パス  \"%s\" が絶対パスではありません。また、カレントディレクトリーの名前を判断する際にエラーが発生しました。\n"
+msgstr ""
+"パス  \"%s\" が絶対パスではありません。また、カレントディレクトリーの名前を判"
+"断する際にエラーが発生しました。\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -138,7 +147,9 @@ msgstr "メモリーが不足\n"
 #: src/getcert.c:274
 #, c-format
 msgid "Error connecting to DBus.\n"
-msgstr "D-Bus へ接続中にエラーが発生しました。\n\n"
+msgstr ""
+"D-Bus へ接続中にエラーが発生しました。\n"
+"\n"
 
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
@@ -148,7 +159,9 @@ msgstr "message bus (D-Bus) サービスが稼働中であることを確認し�
 #: src/getcert.c:282
 #, c-format
 msgid "Error creating DBus request message.\n"
-msgstr "D-Bus 要求メッセージを作成中にエラーが発生しました。\n\n"
+msgstr ""
+"D-Bus 要求メッセージを作成中にエラーが発生しました。\n"
+"\n"
 
 #: src/getcert.c:324
 #, c-format
@@ -175,7 +188,7 @@ msgstr "ローカルの %s サービスからエラー応答を受け取りま�
 msgid "No response received from %s service.\n"
 msgstr "%s サービスから応答が受け取れません。\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -216,13 +229,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Kerberos のプリンシパル名 \"%s\" をアンパース中にエラー: %s\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: オプションには引数が必要です。-- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 無効なオプション -- '%c'\n"
@@ -233,7 +246,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "エラー: 使用されない余計な引数 \"%s\"。\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "エラー:余分なパラメーターが指定されました。\n"
@@ -241,7 +254,8 @@ msgstr "エラー:余分なパラメーターが指定されました。\n"
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
 msgid "Database location or nickname specified without the other.\n"
-msgstr "データベースの場所もしくはニックネームのどちらかが指定されていません。\n"
+msgstr ""
+"データベースの場所もしくはニックネームのどちらかが指定されていません。\n"
 
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
@@ -250,8 +264,11 @@ msgstr "データベースディレクトリーと証明書ファイルの両方
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "データベースディレクトリーとニックネーム、もしくは証明書ファイルの指定されていません。\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"データベースディレクトリーとニックネーム、もしくは証明書ファイルの指定されて"
+"いません。\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -261,12 +278,14 @@ msgstr "キーと証明書の両方を同じファイルに保存することが
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "IPA バックエンドは -N オプション(サブジェクト名) を使用した場合、-K オプション(プリンシパル名)を必要とします。\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"IPA バックエンドは -N オプション(サブジェクト名) を使用した場合、-K オプショ"
+"ン(プリンシパル名)を必要とします。\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "\"%s\" という名前の CA が見つかりません。\n"
@@ -275,7 +294,9 @@ msgstr "\"%s\" という名前の CA が見つかりません。\n"
 #: src/getcert.c:2293
 #, c-format
 msgid "Error setting request arguments.\n"
-msgstr "リクエストの引数を設定中にエラーが発生しました。\n\n"
+msgstr ""
+"リクエストの引数を設定中にエラーが発生しました。\n"
+"\n"
 
 #: src/getcert.c:1100
 #, c-format
@@ -302,7 +323,9 @@ msgstr "新しい追跡リクエストの追加ができません。\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "IDまたはデータベースディレクトリー、もしくはニックネーム、証明書ファイルの指定されていません。\n"
+msgstr ""
+"IDまたはデータベースディレクトリー、もしくはニックネーム、証明書ファイルの指"
+"定されていません。\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -314,12 +337,12 @@ msgstr "リクエスト \"%s\" は変更されました。\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "リクエスト \"%s\" は変更できません。\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "指定されたニックネームを持つリクエストが見つかりませんでした。\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "引数に該当したリクエストが見つかりません。\n"
@@ -337,7 +360,9 @@ msgstr "リクエスト \"%s\" は削除できません。\n"
 #: src/getcert.c:2307
 #, c-format
 msgid "Error modifying \"%s\".\n"
-msgstr "\"%s\" を変更中にエラーが発生しました。\n\n"
+msgstr ""
+"\"%s\" を変更中にエラーが発生しました。\n"
+"\n"
 
 #: src/getcert.c:2323
 #, c-format
@@ -352,612 +377,630 @@ msgstr "\"%s\" を再送中です。\n"
 #: src/getcert.c:2335
 #, c-format
 msgid "Error attempting to submit \"%s\" to \"%s\".\n"
-msgstr "\"%s\" を \"%s\" へ送信中にエラーが発生しました。\n\n"
+msgstr ""
+"\"%s\" を \"%s\" へ送信中にエラーが発生しました。\n"
+"\n"
 
 #: src/getcert.c:2338
 #, c-format
 msgid "Error attempting to submit \"%s\".\n"
-msgstr "\"%s\" を送信中にエラーが発生しました。\n\n"
+msgstr ""
+"\"%s\" を送信中にエラーが発生しました。\n"
+"\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "追跡されている証明書とリクエストの数：%d\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "リクエスト ID '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\t状態: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tCAエラー: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tスタック: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tキーペアストレージ: type=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "なし"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",location='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",nickname='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfile='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\t証明書: type=%s,location='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\t発行者: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tサブジェクト: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\t有効期限: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "不明"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tEメール: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tDNS: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tプリンシパル名: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tキー使用法: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\t拡張キー使用法: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\t保存前コマンド: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\t保存後コマンド: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\t追跡: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\t自動更新: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tCAの種類: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tヘルパーの場所: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\t次のシリアル番号: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\t発行者名:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - クライアント証明書登録ツール\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "使い方: %s request [オプション]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "必須の引数:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* もしストレージに NSS データベースを使う場合:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tキーと証明書のための NSS データベース\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAME\tNSS ベースストレージのためのニックネーム(-d オプションを指定した時のみ有効)\n"
+msgstr ""
+"  -n NAME\tNSS ベースストレージのためのニックネーム(-d オプションを指定した時"
+"のみ有効)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t 名前\tNSS ベースの記憶領域のためのオプションのトークン名(-d オプションを指定した時のみ有効)\n"
+msgstr ""
+"  -t 名前\tNSS ベースの記憶領域のためのオプションのトークン名(-d オプションを"
+"指定した時のみ有効)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* もしストレージのためにファイルを使う時:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE\tプライベートキーのための PEM ファイル\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE\t証明書のための PEM ファイル (-k を指定した場合のみ有効)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* もしキーが暗号化されていた場合:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE\t暗号化されたPIN コードが含まれるファイル\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN コードの値\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "任意の引数:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* 証明書の処理方法の設定:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME\tリクエストに割り当てるニックネーム\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr "  -G TYPE\tキーが存在しない場合に生成されるキーの形式\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr "  -g SIZE\tキーが存在しない場合に生成されるキーのビット長\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr "  -r\t\t有効期限が近づいている時に証明書を更新する(デフォルト)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr "  -R\t\t有効期限が近づいても証明書を更新しない\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\t指定されたCAではなく、デフォルトを使用\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\t名前つきプロファイルまたはテンプレートを使用して、CA がリクエストを処理するか確認します\n"
+msgstr ""
+"  -T PROFILE\t名前つきプロファイルまたはテンプレートを使用して、CA がリクエス"
+"トを処理するか確認します\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* 署名中リクエストのパラメーター:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME\t要求されたサブジェクト名を設定 (デフォルト: CN=<ホスト名>)\n"
+msgstr ""
+"  -N NAME\t要求されたサブジェクト名を設定 (デフォルト: CN=<ホスト名>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\t 拡張キー使用法(EKU)のOIDを設定\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\t要求されたキー使用法の値を設定する\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME\t要求されたプリンシパル名を設定\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAME\t設定するDNS名\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\t要求したEメールアドレスを設定\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* バスのオプション:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tシステムバス上の certmonger サービスに接続\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tセッションバス上の certmonger サービスに接続\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* その他のオプション:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\t証明書を保存する前に実行するコマンド\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\t証明書を保存した後に実行するコマンド\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\t詳細なすべてのエラーを報告\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "使い方: %s start-tracking [オプション]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* もし既存のリクエストを変更する時:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME\t既存の追跡リクエストのニックネーム\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* もしキーが暗号化されていた時:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME\t追跡リクエストに与えるニックネーム\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* 更新時に署名リクエストのためのパラメーター:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\t指定されたキーのOIDで拡張キー使用法(EKU)を上書き\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME\t要求されたプリンシパル名を上書き\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\t要求された DNS 名を上書き\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\t要求されたEメールアドレスを上書き\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "使い方: %s stop-tracking [オプション]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* リクエストの識別子:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME\t追跡リクエストのためのニックネーム\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "使い方: %s resubmit [オプション]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE\t証明書のための PEM ファイル\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* 署名リクエストのための新しいパラメーター値:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\t追跡リクエストに新しいニックネームを付与\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\t指定されたCAではなく、現在のいずれかを使用\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "使い方: %s list [オプション]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* 一般的なオプション:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA\tこの CA に関連付けられているリクエストと証明書の一覧のみ\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr " -r\t未処理の要求についての情報の一覧のみ\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr " -t\t追跡済み証明書についての情報の一覧のみ\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* もしも特定のリクエストが選択された場合:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span>この NSS データベースを使用するリクエストと証明書のみを表示\n"
+msgstr ""
+"  -d DIR<span class=\"whitespace other\" title=\"Tab\">»</span>この NSS デー"
+"タベースを使用するリクエストと証明書のみを表示\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME<span class=\"whitespace other\" title=\"Tab\">»</span>このニックネームを使用するリクエストと証明書のみを表示\n"
+msgstr ""
+"  -n NAME<span class=\"whitespace other\" title=\"Tab\">»</span>このニック"
+"ネームを使用するリクエストと証明書のみを表示\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE<span class=\"whitespace other\" title=\"Tab\">»</span>この PEM ファイルに保存されているリクエストと証明書のみを表示\n"
+msgstr ""
+"  -f FILE<span class=\"whitespace other\" title=\"Tab\">»</span>この PEM ファ"
+"イルに保存されているリクエストと証明書のみを表示\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tシステムバス上の certmonger サービスに接続\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tセッションバス上の certmonger サービスに接続\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "使い方: %s list-cas [オプション]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\t指定された名前の CA についての情報一覧のみ表示\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: 認識できないコマンド\n"
@@ -990,26 +1033,35 @@ msgstr "CA の XMLRPC サーバーの場所を解釈できません。\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "デフォルトのキーテーブルを使用するクライアントで \"host\" サービスの ccache セットアップ中にエラーが発生しました: %s。\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"デフォルトのキーテーブルを使用するクライアントで \"host\" サービスの ccache "
+"セットアップ中にエラーが発生しました: %s。\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "デフォルトのキーテーブルを使用するクライアントで \"%s\" の ccache セットアップ中にエラーが発生しました: %s。\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"デフォルトのキーテーブルを使用するクライアントで \"%s\" の ccache セットアッ"
+"プ中にエラーが発生しました: %s。\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "デフォルトのキーテーブル \"%s\" を使用するクライアントで \"host\" サービスの ccache セットアップ中にエラーが発生しました: %s。\n"
+msgstr ""
+"デフォルトのキーテーブル \"%s\" を使用するクライアントで \"host\" サービスの "
+"ccache セットアップ中にエラーが発生しました: %s。\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr " \"%s\" の ccache をデフォルトのキーテーブル \"%s\" を使用するクライアントでセットアップ中にエラーが発生しました: %s。\n"
+msgstr ""
+" \"%s\" の ccache をデフォルトのキーテーブル \"%s\" を使用するクライアントで"
+"セットアップ中にエラーが発生しました: %s。\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1067,7 +1119,7 @@ msgstr "\t-p FILE    サービスの PID をファイルに書き込む\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         強制的に NSS を FIPS モードにする\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "内部エラーが発生しました。"
 
@@ -1091,7 +1143,7 @@ msgstr "証明書ストレージの種類 \"%s\" はサポートされていま�
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "場所 \"%s\" は絶対パスでなければなりません。"
@@ -1112,7 +1164,8 @@ msgstr "権限が無いため \"%s\" の親ディレクトリにアクセスで�
 #: src/tdbush.c:1190
 #, c-format
 msgid "The parent of location \"%s\" must be a valid directory."
-msgstr "場所 \"%s\" の親ディレクトリーは有効なディレクトリーでなければなりません。"
+msgstr ""
+"場所 \"%s\" の親ディレクトリーは有効なディレクトリーでなければなりません。"
 
 #: src/tdbush.c:550 src/tdbush.c:794 src/tdbush.c:1001 src/tdbush.c:1101
 #: src/tdbush.c:1201
@@ -1122,7 +1175,8 @@ msgstr "場所 \"%s\" はファイルでなければなりません。"
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr "権限が無いため \"%s\" にアクセスできませんでした。"
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1135,7 +1189,7 @@ msgstr "場所 \"%s\" はディレクトリーでなければなりません。"
 msgid "Certificate nickname not specified."
 msgstr "証明書のニックネームが指定されていません。"
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "ニックネーム \"%s\" のリクエストは、すでにあります。"
@@ -1143,9 +1197,10 @@ msgstr "ニックネーム \"%s\" のリクエストは、すでにあります�
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "同じ場所にある証明書は、すでにニックネーム \"%s\" を持つリクエストで使用されています。"
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"同じ場所にある証明書は、すでにニックネーム \"%s\" を持つリクエストで使用され"
+"ています。"
 
 #: src/tdbush.c:731
 #, c-format
@@ -1163,7 +1218,9 @@ msgstr "キーのニックネームが指定されていません。"
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "同じ場所にあるキーは、すでにニックネーム \"%s\" を持つリクエストで使用されています。"
+msgstr ""
+"同じ場所にあるキーは、すでにニックネーム \"%s\" を持つリクエストで使用されて"
+"います。"
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1174,20 +1231,20 @@ msgstr "キー形式 \"%s\" はサポートされません。"
 msgid "No such CA."
 msgstr "そのような証明局はありません。"
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "認証局 \"%s\" は認知されていない証明局です。"
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "認識されていないパラメーターか、もしくは不適切なデータ型です。"
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 6f11e16..d76ef3e 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ka.po b/po/ka.po
index f9b9989..3ba2f32 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Georgian (http://www.transifex.com/projects/p/certmonger/language/ka/)\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/certmonger/"
+"language/ka/)\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/kk.po b/po/kk.po
index 1d13bc8..94c4c6d 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Kazakh (http://www.transifex.com/projects/p/certmonger/language/kk/)\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/certmonger/"
+"language/kk/)\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/km.po b/po/km.po
index 5804a40..ed96148 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Khmer (http://www.transifex.com/projects/p/certmonger/language/km/)\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/certmonger/"
+"language/km/)\n"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index cc339fd..9c3aea7 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Kannada (http://www.transifex.com/projects/p/certmonger/language/kn/)\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/certmonger/"
+"language/kn/)\n"
+"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index a4e0c44..c40ac6f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/certmonger/language/ko/)\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/certmonger/"
+"language/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ks.po b/po/ks.po
index 87ea855..7a027ac 100644
--- a/po/ks.po
+++ b/po/ks.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Kashmiri (http://www.transifex.com/projects/p/certmonger/language/ks/)\n"
+"Language-Team: Kashmiri (http://www.transifex.com/projects/p/certmonger/"
+"language/ks/)\n"
+"Language: ks\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ks\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ku.po b/po/ku.po
index 7958c48..4ad404d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Kurdish (http://www.transifex.com/projects/p/certmonger/language/ku/)\n"
+"Language-Team: Kurdish (http://www.transifex.com/projects/p/certmonger/"
+"language/ku/)\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ku\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ky.po b/po/ky.po
index a14f2d7..af21a33 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Kirgyz (http://www.transifex.com/projects/p/certmonger/language/ky/)\n"
+"Language-Team: Kirgyz (http://www.transifex.com/projects/p/certmonger/"
+"language/ky/)\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/la.po b/po/la.po
index 62038a6..2a7e0a9 100644
--- a/po/la.po
+++ b/po/la.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Latin (http://www.transifex.com/projects/p/certmonger/language/la/)\n"
+"Language-Team: Latin (http://www.transifex.com/projects/p/certmonger/"
+"language/la/)\n"
+"Language: la\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: la\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/lo.po b/po/lo.po
index 71798ad..4759213 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Lao (http://www.transifex.com/projects/p/certmonger/language/lo/)\n"
+"Language-Team: Lao (http://www.transifex.com/projects/p/certmonger/language/"
+"lo/)\n"
+"Language: lo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 7fdfaca..4a86d99 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # FULL NAME <EMAIL@ADDRESS>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Lithuanian (http://www.transifex.com/projects/p/certmonger/language/lt/)\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/certmonger/"
+"language/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -36,8 +38,8 @@ msgstr "Klaida nustatant XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Klaida skaitant serverio atsakymą.\n"
@@ -102,7 +104,9 @@ msgstr "Kelias „%s“ nėra absoliutus, vietoj to bandoma naudoti „%s“.\n"
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Kelias „%s“ nėra absoliutus ir kilo klaida nustatant dabartinio katalogo pavadinimą.\n"
+msgstr ""
+"Kelias „%s“ nėra absoliutus ir kilo klaida nustatant dabartinio katalogo "
+"pavadinimą.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -169,7 +173,7 @@ msgstr "Gautas klaidos pranešimas iš vietinės %s tarnybos.\n"
 msgid "No response received from %s service.\n"
 msgstr "Negautas atsakymas iš %s tarnybos.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +214,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Klaida atstatant Kerberos direktoriaus pavadinimą „%s“: %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: parametras reikalauja argumento -- „%c“\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: netinkamas parametras -- „%c“\n"
@@ -227,7 +231,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Klaida: nenaudojamas papildomas argumentas „%s“.\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Klaida: pateikti nenaudojami papildomi argumentai.\n"
@@ -244,8 +248,11 @@ msgstr "Nurodyti abu: duomenų bazės katalogas ir liudijimo failas.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Nenurodytas nei duomenų bazės katalogas bei slapyvardis, nei liudijimo failas.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Nenurodytas nei duomenų bazės katalogas bei slapyvardis, nei liudijimo "
+"failas.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -255,12 +262,14 @@ msgstr "Raktas ir liudijimas negali būti abu įrašyti į tą patį failą.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "IPA realizacija reikalauja naudoti parametrą -K (direktoriaus pavadinimas), kai naudojamas parametras -N (subjekto pavadinimas).\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"IPA realizacija reikalauja naudoti parametrą -K (direktoriaus pavadinimas), "
+"kai naudojamas parametras -N (subjekto pavadinimas).\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Nerasta LĮ pavadinimu „%s“.\n"
@@ -296,7 +305,9 @@ msgstr "Negalima pridėti naujos sekimo užklausos.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Nenurodytas nei duomenų bazės katalogas bei slapyvardis, nei liudijimo failas.\n"
+msgstr ""
+"Nenurodytas nei duomenų bazės katalogas bei slapyvardis, nei liudijimo "
+"failas.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -308,12 +319,12 @@ msgstr "Užklausa „%s“ pakeista.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Užklausa „%s“ negali būti pakeista.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Nerasta užklausa su nurodytu slapyvardžiu.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Nerasta užklausa, kuri atitinka argumentus.\n"
@@ -353,605 +364,619 @@ msgstr "Klaida bandant pateikti „%s“ į „%s“.\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Klaida bandant pateikti „%s“.\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Sekamų liudijimų ir užklausų skaičius: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Užklausos ID „%s“:\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tbūsena: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tlį-klaida: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tužstrigo: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\traktų poros saugykla: tipas=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NĖRA"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",vieta='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",slapyvardis='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",leksema='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfailas=„%s“"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tliudijimas: tipas=%s,vieta=„%s“"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tLĮ: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tišdavė: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tsubjektas: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tgalioja iki: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "nežinoma"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tel. paštas: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tdirektoriaus pavadinimas: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\trakto naudojimas: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tkomanda prieš įrašant: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tkomanda po įrašymo: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tsekimas: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tautomatinis atnaujinimas: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "LĮ „%s“:\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tlį tipas: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tpagalbininko vieta: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tkitas serijinis numeris: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tžinomų išdavėjų pavadinimai:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - kliento liudijimo įtraukimo įrankis\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Naudojimas: %s užklausa [parametrai]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Būtini argumentai:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Jei naudojama NSS duomenų bazė saugojimui:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tNSS duomenų bazė raktui ir liudijimui\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n PAVADINIMAS\tslapyvardis NSS pagrindo saugyklai (tinka tik su -d)\n"
+msgstr ""
+"  -n PAVADINIMAS\tslapyvardis NSS pagrindo saugyklai (tinka tik su -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t PAVADINIMAS\tnebūtinas leksemos pavadinimas NSS pagrindo saugyklai (tinka tik su -d)\n"
+msgstr ""
+"  -t PAVADINIMAS\tnebūtinas leksemos pavadinimas NSS pagrindo saugyklai "
+"(tinka tik su -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Jei saugyklai naudojami failai:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FAILAS\tprivataus rakto PEM failas\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FAILAS\tliudijimo PEM failas (tinka tik su -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Jei raktai turi būti šifruoti:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FAILAS\tfailas, kuris saugo šifravimo PIN\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN vertė\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Nebūtini argumentai:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Liudijimo apdorojimo nustatymai:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I PAVADINIMAS\tužklausai priskiriamas slapyvardis\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr "  -g DYDIS\tgeneruojamo rakto dydis, jei rakto dar nėra\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tbandymas atnaujinti liudijimą, kai baigiasi galiojimas (numatyta)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tbandymas atnaujinti liudijimą, kai baigiasi galiojimas (numatyta)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr "  -R\t\tnebandyti atnaujinti liudijimo, kai baigiasi galiojimas\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c LĮ\t\tnaudoti nurodytą LĮ vietoj numatytosios\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILIS\tprašyti LĮ apdoroti užklausą naudojant pavadintą profilį ar šabloną\n"
+msgstr ""
+"  -T PROFILIS\tprašyti LĮ apdoroti užklausą naudojant pavadintą profilį ar "
+"šabloną\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parametrai pasirašymo užklausai:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N PAVADINIMAS\tnustatyti subjekto pavadinimą (numatyta: CN=<serveris>)\n"
+msgstr ""
+"  -N PAVADINIMAS\tnustatyti subjekto pavadinimą (numatyta: CN=<serveris>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "-U IŠPLNAUD\tnustatyti prašomą išplėstinį rakto naudojimo OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u RAKTONAUD\tnustatyti prašomą rakto naudojimo vertę\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K PAVADINIMAS\tnustatyti prašomą direktoriaus pavadinimą\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "-D DNSPAV\tnustatyti prašomą DNS pavadinimą\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E ELPAŠTAS\tnustatyti prašomą el. pašto adresą\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Magistralės parametrai:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tprisijungti prie certmonger tarnybos sistemos magistralėje\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tprisijungti prie certmonger tarnybos seanso magistralėje\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Kiti parametrai:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tkomanda, vykdoma prieš įrašant liudijimą\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tkomanda, vykdoma po liudijimo įrašymo\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\tpranešti visą informaciją apie klaidas\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Naudojimas: %s start-tracking [parametrai]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Jei keičiama esama užklausa:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i PAVADINIMAS\tesamos sekamos užklausos slapyvardis\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Jei raktai yra šifruoti:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I PAVADINIMAS\tslapyvardis sekamai užklausai\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parametrai pasirašymo užklausai atnaujinimo metu:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U IŠPLNAUD\tperrašyti išplėstinio rakto naudojimo OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K PAVADINIMAS\tperrašyti prašomą direktoriaus pavadinimą\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSPAV\tperrašyti prašomą DNS pavadinimą\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E ELPAŠAS\tperrašyti prašomą el. pašto adresą\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Naudojimas: %s stop-tracking [parametrai]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Pagal užklausos identifikatorių:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i PAV\tslapyvardis sekamai užklausai\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Naudojimas: %s resubmit [parametrai]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FAILAS\tliudijimo PEM failas\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Naujos parametrų vertės pasirašymo užklausai:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I PAV\tnaujas slapyvardis sekimo užklausai\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c LĮ\t\tnaudoti nurodytą LĮ vietoj dabartinės\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Naudojimas: %s list [parametrai]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Bendri parametrai:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c LĮ\tišvardinti tik užklausas ir liudijimus, susijusius su šia LĮ\n"
+msgstr ""
+"  -c LĮ\tišvardinti tik užklausas ir liudijimus, susijusius su šia LĮ\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tpateikti tik informaciją apie neįvykdytas užklausas\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tpateikti tik informaciją apie sekamus liudijimus\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Jei pasirenkama specifinė užklausa:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR\tišvardinti tik užklausas ir liudijimus, kurie naudoja šią NSS duomenų bazę\n"
+msgstr ""
+"  -d DIR\tišvardinti tik užklausas ir liudijimus, kurie naudoja šią NSS "
+"duomenų bazę\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n PAV\tišvardinti tik užklausas ir liudijimus, kurie naudoja šį slapyvardį\n"
+msgstr ""
+"  -n PAV\tišvardinti tik užklausas ir liudijimus, kurie naudoja šį "
+"slapyvardį\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FAILAS\tišvardinti tik užklausas ir liudijimu, įrašytus į šį PEM failą\n"
+msgstr ""
+"  -f FAILAS\tišvardinti tik užklausas ir liudijimu, įrašytus į šį PEM failą\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tprisijungti prie certmonger tarnybos sistemos magistralėje\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tprisijungti prie certmonger tarnybos seanso magistralėje\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Naudojimas: %s list-cas [parametrai]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c LĮ\tpateikti tik informaciją apie LĮ su šiuo pavadinimu\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: neatpažinta komanda\n"
@@ -984,13 +1009,14 @@ msgstr "Nepavyko nustatyti LĮ XMLRPC serverio vietos.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1087,7 @@ msgstr "\t-p FAILAS   įrašyti tarnybos PID failą\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         priverstinė NSS į FIPS veikseną\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Kilo vidinė klaida."
 
@@ -1085,7 +1111,7 @@ msgstr "Liudijimo saugyklos tipas „%s“ nepalaikomas."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Vieta „%s“ turi būti absoliučiu kelius."
@@ -1116,7 +1142,8 @@ msgstr "Vieta „%s“ turi būti failas."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1156,7 @@ msgstr "Vieta „%s“ turi būti katalogas."
 msgid "Certificate nickname not specified."
 msgstr "Nenurodytas liudijimo slapyvardis."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Jau yra užklausa slapyvardžiu „%s“."
@@ -1137,9 +1164,9 @@ msgstr "Jau yra užklausa slapyvardžiu „%s“."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Liudijimas toje pačioje vietoje jau naudojamas užklausos slapyvardžiu „%s“."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Liudijimas toje pačioje vietoje jau naudojamas užklausos slapyvardžiu „%s“."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1157,7 +1184,8 @@ msgstr "Nenurodyta rakto slapyvardis."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Raktas toje pačioje vietoje jau naudojamas užklausos slapyvardžiu „%s“."
+msgstr ""
+"Raktas toje pačioje vietoje jau naudojamas užklausos slapyvardžiu „%s“."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1168,20 +1196,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "Nėra tokios LĮ."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Liudijimų įstaiga „%s“ nežinoma."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Neatpažintas parametras arba blogas vertės tipas."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/lv.po b/po/lv.po
index 226da0b..d7c5efa 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/certmonger/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/certmonger/"
+"language/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/mai.po b/po/mai.po
index 7385a36..d016bae 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Maithili (http://www.transifex.com/projects/p/certmonger/language/mai/)\n"
+"Language-Team: Maithili (http://www.transifex.com/projects/p/certmonger/"
+"language/mai/)\n"
+"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mai\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/mg.po b/po/mg.po
index d01ee06..551b698 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Malagasy (http://www.transifex.com/projects/p/certmonger/language/mg/)\n"
+"Language-Team: Malagasy (http://www.transifex.com/projects/p/certmonger/"
+"language/mg/)\n"
+"Language: mg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mg\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index 32db57d..b5e6d03 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Macedonian (http://www.transifex.com/projects/p/certmonger/language/mk/)\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/certmonger/"
+"language/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 64748eb..59e4db6 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Malayalam (http://www.transifex.com/projects/p/certmonger/language/ml/)\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/certmonger/"
+"language/ml/)\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/mn.po b/po/mn.po
index 416fc9a..95de21a 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Mongolian (http://www.transifex.com/projects/p/certmonger/language/mn/)\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/certmonger/"
+"language/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 94b4271..09e199d 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Marathi (http://www.transifex.com/projects/p/certmonger/language/mr/)\n"
+"Language-Team: Marathi (http://www.transifex.com/projects/p/certmonger/"
+"language/mr/)\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ms.po b/po/ms.po
index ca1d30a..092d826 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/certmonger/language/ms/)\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/certmonger/"
+"language/ms/)\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ms_MY.po b/po/ms_MY.po
index 473c2ce..dab9a66 100644
--- a/po/ms_MY.po
+++ b/po/ms_MY.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/my.po b/po/my.po
index 06f9b2d..c0d121a 100644
--- a/po/my.po
+++ b/po/my.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Burmese (http://www.transifex.com/projects/p/certmonger/language/my/)\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/certmonger/"
+"language/my/)\n"
+"Language: my\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: my\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index c69ca07..a5947c0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kjartan Maraas <kmaraas@gnome.org>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/certmonger/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/"
+"certmonger/language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "Feil ved oppsett av XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Feil ved tolking av svar fra tjener.\n"
@@ -169,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -308,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -984,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/nds.po b/po/nds.po
index 78a9011..cd27718 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Low German (http://www.transifex.com/projects/p/certmonger/language/nds/)\n"
+"Language-Team: Low German (http://www.transifex.com/projects/p/certmonger/"
+"language/nds/)\n"
+"Language: nds\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ne.po b/po/ne.po
index 8ebd3bf..ae359ed 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Nepali (http://www.transifex.com/projects/p/certmonger/language/ne/)\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/certmonger/"
+"language/ne/)\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 98844e4..15e4580 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Geert Warrink <geert.warrink@onsnet.nu>, 2011-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/certmonger/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/certmonger/"
+"language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "Fout bij het opzetten van XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Fout bij het ontleden van antwoord van de server.\n"
@@ -95,14 +96,18 @@ msgstr "Interne fout: geen antwoord op \"%s?%s\".\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Pad \"%s\" is niet absoluut, in plaats daarvan wordt geprobeerd om \"%s\" te gebruiken.\n"
+msgstr ""
+"Pad \"%s\" is niet absoluut, in plaats daarvan wordt geprobeerd om \"%s\" te "
+"gebruiken.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Pad \"%s\" is niet absoluut en er was een fout bij het bepalen van de naam van de huidige map.\n"
+msgstr ""
+"Pad \"%s\" is niet absoluut en er was een fout bij het bepalen van de naam "
+"van de huidige map.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -169,7 +174,7 @@ msgstr "Fout ontvangen van de lokale %s service.\n"
 msgid "No response received from %s service.\n"
 msgstr "Geen reactie ontvangen van %s service.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +215,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Fout bij unparsing van Kerberos principal naam \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- '%c'\n"
@@ -227,10 +232,12 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Fout: niet gebruikt extra argument \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
-msgstr "Fout: er zijn niet gebruikte extra argumenten opgegeven.\n \n"
+msgstr ""
+"Fout: er zijn niet gebruikte extra argumenten opgegeven.\n"
+" \n"
 
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
@@ -244,23 +251,28 @@ msgstr "Database map en certificaatbestand beide gespecificeerd.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr "Zowel database map als bijnaam of certificaat niet opgegeven.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
 msgid "Key and certificate can not both be saved to the same file.\n"
-msgstr "Sleutel en certificaat kunnen niet beide in hetzelfde bestand opgeslagen worden.\n"
+msgstr ""
+"Sleutel en certificaat kunnen niet beide in hetzelfde bestand opgeslagen "
+"worden.\n"
 
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "De IPA backend vereist het gebruik van de -K optie (principal naam) als de -N optie (onderwerpnaam) gebruikt wordt.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"De IPA backend vereist het gebruik van de -K optie (principal naam) als de -"
+"N optie (onderwerpnaam) gebruikt wordt.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Geen CA met de naam \"%s\" gevonden.\n"
@@ -308,12 +320,12 @@ msgstr "Verzoek \"%s\" gewijzigd.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Verzoek \"%s\" kan niet gewijzigd worden.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Geen aanvraag gevonden met de gespecificeerde bijnaam.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Geen verzoek gevonden dat overeenkomt met argumenten.\n"
@@ -353,605 +365,623 @@ msgstr "Fout bij het indienen van \"%s\" bij \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Fout bij het indienen van \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Aantal certificaten en verzoeken dat bijgehouden wordt:%d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Verzoek ID '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "»status: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "»ca-fout: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "»vast: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "»sleutelpaar opslag: type=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "GEEN"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",locatie='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",bijnaam='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinbestand='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "»certificaat: type=%s,locatie='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "»CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "»uitgever: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "»onderwerp: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "»verloopt: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "»email: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "»dns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "»principal naam: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "\tIP adres: "
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tkey usage: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "»eku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tpre-save command: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tpost-save command: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "»track: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "»auto-renew: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "»ca-type: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "»helper-locatie %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "»next-serial-nummer: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "»bekende-uitgever-namen:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - cliënt certificaat uitgeef gereedschap\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Gebruik: %s request [opties]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Vereiste argumenten:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Als een NSS database voor opslag gebruikt wordt:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d MAP»NSS database voor sleutel en cert\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAAM»bijnaam voor op NSS gebaseerde opslag (alleen geldig met -d)\n"
+msgstr ""
+"  -n NAAM»bijnaam voor op NSS gebaseerde opslag (alleen geldig met -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAAM»optionele token naam voor op NSS gebaseerde opslag (alleen geldig met -d)\n"
+msgstr ""
+"  -t NAAM»optionele token naam voor op NSS gebaseerde opslag (alleen geldig "
+"met -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Als bestanden voor opslag gebruikt worden:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k BESTAND»PEM bestand voor prive sleutel\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f BESTAND»PEM bestand voor certificaat (alleen geldig met -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Als sleutels gecodeerd moeten worden:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p BESTAND»bestand welke de codering PIN bevat\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN»PIN waarde\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Optionele argumenten:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Certificaat afhandel instellingen:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAAM»bijnaam toegekend aan het verzoek\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
-msgstr "  -G TYPE\tsleuteltype dat aangemaakt wordt als er nog geen aanwezig is\n"
+msgstr ""
+"  -G TYPE\tsleuteltype dat aangemaakt wordt als er nog geen aanwezig is\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g GROOTTE»grootte van de te genereren sleutel als er nog geen aanwezig is\n"
+msgstr ""
+"  -g GROOTTE»grootte van de te genereren sleutel als er nog geen aanwezig "
+"is\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r»»probeer het certificaat te vernieuwen als de verloopdatum nadert (standaard)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r»»probeer het certificaat te vernieuwen als de verloopdatum nadert "
+"(standaard)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R»»probeer het certificaat niet te vernieuwen als de verloopdatum nadert\n"
+msgstr ""
+"  -R»»probeer het certificaat niet te vernieuwen als de verloopdatum nadert\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA»»gebruik de gespecificeerde CA in plaats van de standaard\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFILE\tvraag de CA om het verzoek de verwerken met het opgegeven profiel of template\n"
+msgstr ""
+"  -T PROFILE\tvraag de CA om het verzoek de verwerken met het opgegeven "
+"profiel of template\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parameters voor het ondertekening verzoek:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAAM»stel de gevraagde subject naam in (standaard: CN=<hostnaam>)\n"
+msgstr ""
+"  -N NAAM»stel de gevraagde subject naam in (standaard: CN=<hostnaam>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE»stel het gevraagde uitgebreide sleutel gebruik OID in\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\tstel aangevraagde sleutel gebruik waarde in\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAAM»stel de gevraagde principal naam in\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAAM»stel de gevraagde DNS naam in\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL»stel het gevraagde email adres in\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr "  -A ADRES\tstel vereiste IP adres in\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Bus opties:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S»»verbind met de certmonger service op de systeem bus\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s»»verbind met de certmonger service op de sessie bus\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Andere opties:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tcommando uit te voeren voor het opslaan van het certificaat\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tcommando uit te voeren na het opslaan van het certificaat\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v»rapporteer alle foutdetails\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Gebruik: %s start-tracking [opties]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Als een bestaande aanvraag veranderd wordt:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAAM»bijnaam van een bestaand track verzoek\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Als sleutels gecodeerd zijn:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAAM»bijnaam te geven aan track verzoek\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parameters voor het ondertekeningverzoek bij het vernieuwen:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE»overschrijf gevraagde uitgebreide sleutel gebruik OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAAM»overschrijf gevraagde principal naame\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAAM»overschrijf gevraagde DNS naam\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL»overschrijf gevraagde email adres\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr "  -A ADRES\toverschrijf gevraagde IP adres\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Gebruik: %s stop-tracking [opties]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Op verzoek id:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAAM»bijnaam voor track verzoek\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Gebruik: %s resubmit [opties]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f BESTAND»PEM bestand voor certificaat\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nieuwe parameterwaarden voor de ondertekening verzoek:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAAM»nieuwe bijnaam om aan track verzoek te geven\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA»»gebruik de gespecificeerde CA in plaats van de huidige\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Gebruik: %s list [opties]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Algemene opties:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA»laat allen verzoeken certificaten zien die bij deze CA horen\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r»laat alleen informatie zien over uitstaande verzoeken\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t»laat alleen informatie zien over gevolgde certificaten\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Als een specifiek verzoek geselecteerd wordt:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d MAP»toon alleen verzoeken en certificaten die deze NSS database gebruiken\n"
+msgstr ""
+"  -d MAP»toon alleen verzoeken en certificaten die deze NSS database "
+"gebruiken\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAAM» toon alleen verzoeken en certificaten die deze bijnaam gebruiken\n"
+msgstr ""
+"  -n NAAM» toon alleen verzoeken en certificaten die deze bijnaam gebruiken\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f BESTAND»toon alleen verzoeken en certificaten die in dit PEM bestand opgeslagen zijn\n"
+msgstr ""
+"  -f BESTAND»toon alleen verzoeken en certificaten die in dit PEM bestand "
+"opgeslagen zijn\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S»verbind met de certmonger service op de systeem bus\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s»verbind met de certmonger service op de sessie bus\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Gebruik: %s list-cas [opties]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA»laat alleen informatie zien over de CA met deze naam\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: onbekend commando\n"
@@ -984,26 +1014,35 @@ msgstr "Kan locatie van CA XMLRPC server niet vaststellen.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Fout bij het instellen van ccache voor \"host\" service op cliënt die standaard keytab: %s gebruikt.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Fout bij het instellen van ccache voor \"host\" service op cliënt die "
+"standaard keytab: %s gebruikt.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Fout bij het instellen van ccache voor  \"%s\" op cliënt die standaard keytab: %s gebruikt.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Fout bij het instellen van ccache voor  \"%s\" op cliënt die standaard "
+"keytab: %s gebruikt.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Fout bij het instellen van ccache voor \"host\" service die keytab \"%s\" gebruikt: %s.\n"
+msgstr ""
+"Fout bij het instellen van ccache voor \"host\" service die keytab \"%s\" "
+"gebruikt: %s.\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Fout bij het instellen van ccache voor \"%s\" op cliënt die keytab \"%s\" gebruikt: %s.\n"
+msgstr ""
+"Fout bij het instellen van ccache voor \"%s\" op cliënt die keytab \"%s\" "
+"gebruikt: %s.\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1061,7 +1100,7 @@ msgstr "\t-p BESTAND schrijf een service PID naar bestand\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         forceer NSS naar de FIPS modus\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Er is een interne fout opgetreden."
 
@@ -1085,7 +1124,7 @@ msgstr "Certificaat opslag type \"%s\" niet ondersteund."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "De locatie \"%s\" moet een absoluut pad zijn."
@@ -1100,7 +1139,9 @@ msgstr "Certificaat opslaglocatie niet gespecificeerd."
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "Er is geen toegang tot de ouder van locatie \"%s\" wegens onvoldoende rechten."
+msgstr ""
+"Er is geen toegang tot de ouder van locatie \"%s\" wegens onvoldoende "
+"rechten."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1116,7 +1157,8 @@ msgstr "De locatie \"%s\" moet een bestand zijn."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr "Er is geen toegang tot de locatie \"%s\" wegens onvoldoende rechten."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1171,7 @@ msgstr "De locatie \"%s\" moet een map zijn."
 msgid "Certificate nickname not specified."
 msgstr "Certificaat bijnaam niet opgegeven."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Er is al een verzoek met de bijnaam \"%s\"."
@@ -1137,9 +1179,10 @@ msgstr "Er is al een verzoek met de bijnaam \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Een certificaat op dezelfde locatie wordt al gebruik door een aanvraag met bijnaam \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Een certificaat op dezelfde locatie wordt al gebruik door een aanvraag met "
+"bijnaam \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1157,7 +1200,9 @@ msgstr "Sleutel bijnaam niet opgegeven."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Een sleutel op dezelfde locatie wordt al gebruik door een aanvraag met bijnaam \"%s\"."
+msgstr ""
+"Een sleutel op dezelfde locatie wordt al gebruik door een aanvraag met "
+"bijnaam \"%s\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1168,20 +1213,20 @@ msgstr "Er is geen ondersteuning voor sleuteltype \"%s\"."
 msgid "No such CA."
 msgstr "Onbekende CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Certificaat autoriteit \"%s\" is niet bekend."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Onbekende parameter of verkeerde type waarde."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Fout bij het ontleden van argumenten."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Onbekende eigenschap naam."
 
diff --git a/po/nn.po b/po/nn.po
index c4541af..c3b9a9e 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/certmonger/language/nn/)\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/"
+"certmonger/language/nn/)\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index 0342e9f..b721954 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Norwegian (http://www.transifex.com/projects/p/certmonger/language/no/)\n"
+"Language-Team: Norwegian (http://www.transifex.com/projects/p/certmonger/"
+"language/no/)\n"
+"Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/nso.po b/po/nso.po
index 48bd988..ee87aba 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Northern Sotho (http://www.transifex.com/projects/p/certmonger/language/nso/)\n"
+"Language-Team: Northern Sotho (http://www.transifex.com/projects/p/"
+"certmonger/language/nso/)\n"
+"Language: nso\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index b4b82bc..6529f11 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Oriya (http://www.transifex.com/projects/p/certmonger/language/or/)\n"
+"Language-Team: Oriya (http://www.transifex.com/projects/p/certmonger/"
+"language/or/)\n"
+"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: or\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index a932282..585a534 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/certmonger/language/pa/)\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
+"certmonger/language/pa/)\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index bc013b7..76a1926 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Nalin Dahyabhai <nalin@fedoraproject.org>, 2011
 # Piotr Drąg <piotrdrag@gmail.com>, 2011-2014
@@ -9,15 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-22 16:08+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/certmonger/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/certmonger/"
+"language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -37,8 +39,8 @@ msgstr "Błąd podczas ustawiania dla XML-RPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Błąd podczas przetwarzania odpowiedzi serwera.\n"
@@ -56,7 +58,8 @@ msgstr "Zażądano odnowienia, ale nie podano numeru seryjnego.\n"
 #: src/dogtag.c:366
 #, c-format
 msgid "No end-entity URL (-E) given, and no default known.\n"
-msgstr "Nie podano adresu URL końcowej jednostki (-E), a nie ma wartości domyślnej.\n"
+msgstr ""
+"Nie podano adresu URL końcowej jednostki (-E), a nie ma wartości domyślnej.\n"
 
 #: src/dogtag.c:370
 #, c-format
@@ -96,14 +99,17 @@ msgstr "Wewnętrzny błąd: brak odpowiedzi na \"%s?%s\".\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Ścieżka \"%s\" nie jest bezwzględna, próbowanie użycia \"%s\" zamiast niej.\n"
+msgstr ""
+"Ścieżka \"%s\" nie jest bezwzględna, próbowanie użycia \"%s\" zamiast niej.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Ścieżka \"%s\" nie jest bezwzględna i wystąpił błąd podczas określania nazwy bieżącego katalogu.\n"
+msgstr ""
+"Ścieżka \"%s\" nie jest bezwzględna i wystąpił błąd podczas określania nazwy "
+"bieżącego katalogu.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -138,7 +144,9 @@ msgstr "Błąd podczas łączenia z D-Bus.\n"
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
 msgid "Please verify that the message bus (D-Bus) service is running.\n"
-msgstr "Proszę sprawdzić, czy usługa magistrali komunikatów (D-Bus) jest uruchomiona.\n"
+msgstr ""
+"Proszę sprawdzić, czy usługa magistrali komunikatów (D-Bus) jest "
+"uruchomiona.\n"
 
 #: src/getcert.c:282
 #, c-format
@@ -170,7 +178,7 @@ msgstr "Otrzymano błędną odpowiedź z lokalnej usługi %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Nie otrzymano odpowiedzi z usługi %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr "Stan %s, zatkanie: %s.\n"
@@ -208,16 +216,18 @@ msgstr "Błąd podczas przetwarzania nazwy naczelnika Kerberosa \"%s\": %s.\n"
 #: src/getcert.c:724 src/getcert.c:1565 src/getcert.c:2045
 #, c-format
 msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
-msgstr "Błąd podczas odwracania przetworzenia nazwy naczelnika Kerberosa \"%s\": %s.\n"
+msgstr ""
+"Błąd podczas odwracania przetworzenia nazwy naczelnika Kerberosa \"%s\": "
+"%s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga parametru - \"%c\"\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nieprawidłowa opcja - \"%c\"\n"
@@ -228,7 +238,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Błąd: nieużywany dodatkowy parametr \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Błąd: podano nieużywane dodatkowe parametry.\n"
@@ -245,7 +255,8 @@ msgstr "Określono zarówno katalog bazy danych, jak i plik certyfikatu.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr "Nie podano katalogu bazy danych i pseudonimu lub pliku certyfikatu.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -256,12 +267,14 @@ msgstr "Nie można zapisać klucza i certyfikatu do tego samego pliku.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Zaplecze IPA wymaga użycia opcji -K (nazwy naczelnika), kiedy używana jest opcja -N (nazwa tematu).\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Zaplecze IPA wymaga użycia opcji -K (nazwy naczelnika), kiedy używana jest "
+"opcja -N (nazwa tematu).\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Nie odnaleziono CA o nazwie \"%s\".\n"
@@ -297,7 +310,9 @@ msgstr "Nie można dodać nowego żądania śledzenia.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Nie podano identyfikatora, albo katalogu bazy danych i pseudonimu, albo pliku certyfikatu.\n"
+msgstr ""
+"Nie podano identyfikatora, albo katalogu bazy danych i pseudonimu, albo "
+"pliku certyfikatu.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -309,12 +324,12 @@ msgstr "Zmodyfikowano żądanie \"%s\".\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Nie można zmodyfikować żądania \"%s\".\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Nie odnaleziono żądania dla podanego pseudonimu.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Nie odnaleziono żądania pasującego do parametrów.\n"
@@ -354,605 +369,626 @@ msgstr "Błąd podczas próby wysłania \"%s\" do \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Błąd podczas próby wysłania \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr "Identyfikator żądania \"%s\" jest odświeżany.\n"
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr "Identyfikator żądania \"%s\" NIE jest odświeżany.\n"
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Liczba śledzonych certyfikatów i żądań: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Identyfikator żądania \"%s\":\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tstan: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tbłąd-ca: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tzatkanie: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tpamięć masowa pary kluczy: typ=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "BRAK"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",położenie=\"%s\""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",pseudonim=\"%s\""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token=\"%s\""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin=\"%s\""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",plik_pinu=\"%s\""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertyfikat: typ=%s,położenie=\"%s\""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\twystawca: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\ttemat: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\twygasa: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "nieznane"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\te-mail: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnazwa naczelnika: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "\tAdres IP: "
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tużycie klucza: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr "\tcertyfikaty roota zapisane do plików:\n"
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr "\tinne certyfikaty roota zapisane do plików:\n"
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr "\tinne certyfikaty zapisane do plików:\n"
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr "\tcertyfikaty roota zapisane w bazach danych:\n"
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr "\tinne certyfikaty roota zapisane w bazach danych:\n"
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr "\tinne certyfikaty zapisane w bazach danych:\n"
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tpolecenie pre-save: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tpolecenie post-save: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tścieżka: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tautomatyczne-odnawianie: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA \"%s\":\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr "\tidentyfikuje się jako: %s\n"
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\ttyp-ca: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tpołożenie-pomocnika: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tnastępny-numer-seryjny: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnazwy-znanych-wystawców: \n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr "\tznane profile/szablony/typy certyfikatów:\n"
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr "\tdomyślny profil/szablon/typ certyfikatu: %s\n"
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr "Nie podano pseudonimu CA ani flagi -a.\n"
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr "Dane dla CA \"%s\" są odświeżane.\n"
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr "Dane dla nienazwanego CA są odświeżane.\n"
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr "\tbłąd podczas odświeżania danych CA\n"
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - narzędzie kwalifikowania certyfikatów klientów\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Użycie: %s request [opcje]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Wymagane parametry:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Podczas używania bazy NSS do przechowywania danych:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d KAT\tbaza danych NSS dla klucza i certyfikatu\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAZWA\tpseudonim dla przechowywania danych opartego na NSS (prawidłowe tylko z opcją -d)\n"
+msgstr ""
+"  -n NAZWA\tpseudonim dla przechowywania danych opartego na NSS (prawidłowe "
+"tylko z opcją -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAZWA\topcjonalna nazwa tokenu dla przechowywania opartego na NSS (prawidłowe tylko z opcją -d)\n"
+msgstr ""
+"  -t NAZWA\topcjonalna nazwa tokenu dla przechowywania opartego na NSS "
+"(prawidłowe tylko z opcją -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Podczas używania plików do przechowywania:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k PLIK\tplik PEM dla klucza prywatnego\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f PLIK\tplik PEM dla certyfikatu (prawidłowe tylko z opcją -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Jeśli klucze mają zostać zaszyfrowane:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p PLIK\tplik przechowujący kod PIN szyfrowania\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\twartość kodu PIN\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Opcjonalne parametry:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Ustawienia obsługiwania certyfikatów:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAZWA\tpseudonim do przydzielenia żądaniu\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr "  -G TYP\ttyp klucza do utworzenia, jeśli jeszcze nie ma żadnego\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g ROZMIAR\trozmiar klucza do utworzenia, jeśli jeszcze nie ma żadnego\n"
+msgstr ""
+"  -g ROZMIAR\trozmiar klucza do utworzenia, jeśli jeszcze nie ma żadnego\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tpróbuje odnowić certyfikat, kiedy zbliża się jego wygaszenie (domyślnie)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tpróbuje odnowić certyfikat, kiedy zbliża się jego wygaszenie "
+"(domyślnie)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tnie próbuje odnowić certyfikatu, kiedy zbliża się jego wygaszenie\n"
+msgstr ""
+"  -R\t\tnie próbuje odnowić certyfikatu, kiedy zbliża się jego wygaszenie\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tużywa podanego CA zamiast domyślnego\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFIL\t\tprosi CAo przetworzenie żądania używając nazwanego profilu lub szablonu\n"
+msgstr ""
+"  -T PROFIL\t\tprosi CAo przetworzenie żądania używając nazwanego profilu "
+"lub szablonu\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parametry do żądania podpisania:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAZWA\tustawia żądaną nazwę tematu (domyślnie: CN=<nazwa_komputera>)\n"
+msgstr ""
+"  -N NAZWA\tustawia żądaną nazwę tematu (domyślnie: CN=<nazwa_komputera>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U UŻYCIE_ZEWNĘTRZNE\tustawia żądany OID użycia rozszerzonego klucza\n"
+msgstr ""
+"  -U UŻYCIE_ZEWNĘTRZNE\tustawia żądany OID użycia rozszerzonego klucza\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u UŻYCIE-KLUCZA\tustawia żądaną wartość użycia klucza\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAZWA\tustawia żądaną nazwę naczelnika\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D NAZWA_DNS\tustawia żądaną nazwę DNS\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E E-MAIL\tustawia żądany adres e-mail\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr "  -A ADRES\tustawia żądany adres IP\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Opcje magistrali:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tłączy się z usługą certmonger przez magistralę systemową\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tłączy się z usługą certmonger przez magistralę sesji\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Inne opcje:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tpolecenie do wykonania przed zapisaniem certyfikatu\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tpolecenie do wykonania po zapisaniu certyfikatu\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr "  -F\tplik, w którym przechowywać certyfikaty CA\n"
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr "  -a\tbaza danych NSS, w której przechowywać certyfikaty CA\n"
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr "  -w\tpróbuje czekać na wydanie certyfikatu\n"
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\tzgłasza wszystkie informacje o błędach\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Użycie: %s start-tracking [opcje]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Podczas modyfikowania istniejącego żądania:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAZWA\tpseudonim istniejącego żądania śledzenia\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Jeśli klucze są zaszyfrowane:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAZWA\tpseudonim do nadania śledzonemu żądaniu\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parametry do żądania podpisania w czasie odnowienia:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U UŻYCIE_ZEWNĘTRZNE\tzastępuje żądany OID użycia rozszerzonego klucza\n"
+msgstr ""
+"  -U UŻYCIE_ZEWNĘTRZNE\tzastępuje żądany OID użycia rozszerzonego klucza\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAZWA\tzastępuje żądaną nazwę naczelnika\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D NAZWA_DNS\tzastępuje żądaną nazwę DNS\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E E-MAIL\tzastępuje żądany adres e-mail\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr "  -A ADRES\tzastępuje żądany adres IP\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Użycie: %s stop-tracking [opcje]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Według identyfikatora żądania:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAZWA\tpseudonim dla śledzonego żądania\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Użycie: %s resubmit [opcje]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f PLIK\tplik PEM dla certyfikatu\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Wartości nowych parametrów dla żądania podpisania:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAZWA\tnowy pseudonim przyznany śledzonemu żądaniu\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tużywa podanego CA zamiast bieżącego\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Użycie: %s list [opcje]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Ogólne opcje:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA\twyświetla tylko żądania i certyfikaty powiązane z tym CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\twyświetla informacje tylko o oczekujących żądaniach\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\twyświetla informacje tylko o śledzonych certyfikatach\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Jeśli wybrano konkretne żądanie:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d KATALOG\twyświetla tylko żądania i certyfikaty, które używają tej bazy danych NSS\n"
+msgstr ""
+"  -d KATALOG\twyświetla tylko żądania i certyfikaty, które używają tej bazy "
+"danych NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAZWA\twyświetla tylko żądania i certyfikaty, które używają tego pseudonimu\n"
+msgstr ""
+"  -n NAZWA\twyświetla tylko żądania i certyfikaty, które używają tego "
+"pseudonimu\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f PLIK\twyświetla tylko żądania i certyfikaty przechowywane w tym pliku PEM\n"
+msgstr ""
+"  -f PLIK\twyświetla tylko żądania i certyfikaty przechowywane w tym pliku "
+"PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tłączy się z uslugą certmonger przez magistralę systemową\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tłączy się z usługą certmonger przez magistralę sesji\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr "Użycie: %s refresh [opcje]\n"
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr "  -a   \todświeża informacje o wszystkich oczekujących żądaniach\n"
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr "Użycie: %s status [opcje]\n"
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr "* Wybieranie konkretnego żądania:\n"
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr "* Podczas używania bazy NSS do przechowywania danych:\n"
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr "  -d KATALOG\twyświetla stan żądania w bazie danych NSS\n"
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr "  -n NAZWA\twyświetla stan certyfikatu, który używa tego pseudonimu\n"
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr "* Podczas używania plików do przechowywania:\n"
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
-msgstr "  -f PLIK\twyświetla stan certyfikatu przechowywanego w tym pliku PEM\n"
+msgstr ""
+"  -f PLIK\twyświetla stan certyfikatu przechowywanego w tym pliku PEM\n"
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Użycie: %s list-cas [opcje]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\twyświetla informacje tylko o CA o tej nazwie\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr "Użycie: %s refresh-ca [opcje]\n"
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr "  -c CA\todświeża informacje o CA o tej nazwie\n"
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr "  -a   \todświeża informacje o wszystkich znanych CA\n"
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: nierozpoznane polecenie\n"
@@ -985,26 +1021,35 @@ msgstr "Nie można określić położenia serwera XML-RPC CA.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Błąd podczas ustawiania ccache dla usługi \"gospodarza\" na kliencie używając domyślnej tablicy kluczy: %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Błąd podczas ustawiania ccache dla usługi \"gospodarza\" na kliencie "
+"używając domyślnej tablicy kluczy: %s.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Błąd podczas ustawiania ccache dla \"%s\" na kliencie używając domyślnej tablicy kluczy: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Błąd podczas ustawiania ccache dla \"%s\" na kliencie używając domyślnej "
+"tablicy kluczy: %s.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Błąd podczas ustawiania ccache dla usługi \"gospodarza\" na kliencie używając domyślnej tablicy kluczy \"%s\": %s.\n"
+msgstr ""
+"Błąd podczas ustawiania ccache dla usługi \"gospodarza\" na kliencie "
+"używając domyślnej tablicy kluczy \"%s\": %s.\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Błąd podczas ustawiania ccache dla \"%s\" na kliencie używając domyślnej tablicy kluczy \"%s\": %s.\n"
+msgstr ""
+"Błąd podczas ustawiania ccache dla \"%s\" na kliencie używając domyślnej "
+"tablicy kluczy \"%s\": %s.\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1044,7 +1089,8 @@ msgstr "\t-f         zmiana na demona\n"
 
 #: src/main.c:128
 msgid "\t-b TIMEOUT bus-activated, idle timeout\n"
-msgstr "\t-b CZAS    aktywacja przez magistralę, czas oczekiwania na bezczynność\n"
+msgstr ""
+"\t-b CZAS    aktywacja przez magistralę, czas oczekiwania na bezczynność\n"
 
 #: src/main.c:129
 msgid "\t-B         don't use an idle timeout\n"
@@ -1062,7 +1108,7 @@ msgstr "\t-p PLIK    zapisuje PID usługi do pliku\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         wymusza przejście NSS do trybu FIPS\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Wystąpił wewnętrzny błąd."
 
@@ -1086,7 +1132,7 @@ msgstr "Typ przechowywania certyfikatu \"%s\" nie jest obsługiwany."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Położenie \"%s\" musi być ścieżką bezwzględną."
@@ -1101,7 +1147,9 @@ msgstr "Nie podano położenia przechowywania certyfikatu."
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "Nie można uzyskać dostępu do położenia nadrzędnego dla \"%s\" z powodu niewystarczających uprawnień."
+msgstr ""
+"Nie można uzyskać dostępu do położenia nadrzędnego dla \"%s\" z powodu "
+"niewystarczających uprawnień."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1117,8 +1165,11 @@ msgstr "Położenie \"%s\" musi być plikiem."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
-msgstr "Nie można uzyskać dostępu do położenia \"%s\" z powodu niewystarczających uprawnień."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
+msgstr ""
+"Nie można uzyskać dostępu do położenia \"%s\" z powodu niewystarczających "
+"uprawnień."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
 #: src/tdbush.c:1145
@@ -1130,7 +1181,7 @@ msgstr "Położenie \"%s\" musi być katalogiem."
 msgid "Certificate nickname not specified."
 msgstr "Nie podano pseudonimu certyfikatu."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Istnieje już żądanie o pseudonimie \"%s\"."
@@ -1138,9 +1189,10 @@ msgstr "Istnieje już żądanie o pseudonimie \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Certyfikat w tym samym położeniu jest już używany przez żądanie o pseudonimie \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Certyfikat w tym samym położeniu jest już używany przez żądanie o "
+"pseudonimie \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1158,7 +1210,9 @@ msgstr "Nie podano pseudonimu klucza."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Klucz w tym samym położeniu jest już używany przez żądanie o pseudonimie \"%s\"."
+msgstr ""
+"Klucz w tym samym położeniu jest już używany przez żądanie o pseudonimie \"%s"
+"\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1169,20 +1223,20 @@ msgstr "Brak obsługi dla typu klucza \"%s\"."
 msgid "No such CA."
 msgstr "Nie ma takiego CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Nieznane CA \"%s\""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Nierozpoznany parametr lub błędny typ wartości."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Błąd podczas przetwarzania parametrów."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Nierozpoznana nazwa właściwości."
 
diff --git a/po/pt.po b/po/pt.po
index 2a5711d..612b229 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Manuela Silva <manuela.silva@sky.com>, 2014
 # Miguel Sousa <migueljorgesousa@sapo.pt>, 2012
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/certmonger/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/certmonger/"
+"language/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -39,8 +40,8 @@ msgstr "Erro ao configurar para XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Erro a analisar a resposta do servidor.\n"
@@ -98,14 +99,17 @@ msgstr ""
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "O caminho \"%s\" não é absoluto, a tentar utilizar \"%s\" em alternativa.\n"
+msgstr ""
+"O caminho \"%s\" não é absoluto, a tentar utilizar \"%s\" em alternativa.\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "O caminho \"%s\" não é absoluto, e houve um erro ao determinar o nome do directório actual.\n"
+msgstr ""
+"O caminho \"%s\" não é absoluto, e houve um erro ao determinar o nome do "
+"directório actual.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -172,7 +176,7 @@ msgstr "Recebida resposta de erro do serviço local %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Não foi recebida uma resposta do serviço %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -213,13 +217,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Erro ao analisar novamente o nome Kerberos principal \"%s\": %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requer um argumento -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- '%c'\n"
@@ -230,7 +234,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Erro: argumento extra não utilizado \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Erro: foram fornecidos argumentos extra não utilizados.\n"
@@ -243,12 +247,17 @@ msgstr "Localização da base de dados ou nome especificado sem o outro.\n"
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
 msgid "Database directory and certificate file both specified.\n"
-msgstr "Directório da base de dados e do ficheiro do certificado ambos especificados.\n"
+msgstr ""
+"Directório da base de dados e do ficheiro do certificado ambos "
+"especificados.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Não foi especificada uma directoria de base de dados e nome ou um ficheiro de certificado.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Não foi especificada uma directoria de base de dados e nome ou um ficheiro "
+"de certificado.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -258,12 +267,14 @@ msgstr "Não é possível gravar a chave e o certicifado no mesmo ficheiro.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "O IPA backend necessita o uso da opção -K (nome principal) quando a opção -N (nome do assunto) é usada.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"O IPA backend necessita o uso da opção -K (nome principal) quando a opção -N "
+"(nome do assunto) é usada.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Não foi encontrado um CA com o nome \"%s\".\n"
@@ -299,7 +310,9 @@ msgstr "O novo pedido de monitorização não pode ser adicionado.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Nenhum ID, directoria da base de dados e nome ou ficheiro do certificado especificados.\n"
+msgstr ""
+"Nenhum ID, directoria da base de dados e nome ou ficheiro do certificado "
+"especificados.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -311,12 +324,12 @@ msgstr "Pedido \"%s\" modificado.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Pedido \"%s\" não pode ser modificado.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Não foi encontrado pedido com a alcunha especificada.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Nenhum pedido encontrado que corresponda aos argumentos.\n"
@@ -356,605 +369,621 @@ msgstr "Erro a tentar enviar \"%s\" para \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Erro a tentar enviar \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Número de certificados e pedidos a serem monitorizados: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID do pedido '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\testado: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\terro-ca: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tpreso: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tarmazenamento par de chaves: tipo=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NONE"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",localização='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",alcunha='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",ficheiro pin='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertificado: tipo=%s,localização='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\temissor: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tassunto: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\texpira: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tcorreio electrónico: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnome principal: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tcomando pré-guardado: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttraçagem: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\trenovação automática: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\ttipo-ca: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tlocalização-ajuda: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tpróximo-número-série: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnomes-emissores-conhecidos:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - ferramenta de registo do certificado do cliente\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Uso: %s pedido [opções]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Argumentos requeridos:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Se usar uma base de dados NSS para armazenamento:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tBase de dados NSS para a chave e certificado\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NAME\tnome para o armazenamento NSS (apenas válido com a opção -d)\n"
+msgstr ""
+"  -n NAME\tnome para o armazenamento NSS (apenas válido com a opção -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAME\tnome de testemunho opcional para o armazenamento NSS (apenas válido com a opção -d)\n"
+msgstr ""
+"  -t NAME\tnome de testemunho opcional para o armazenamento NSS (apenas "
+"válido com a opção -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Se usar ficheiros para armazenamento:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE\tFicheiro PEM para a chave privada\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
-msgstr "  -f FILE\tFicheiro PEM para o certificado (apenas válido com a opção -k)\n"
+msgstr ""
+"  -f FILE\tFicheiro PEM para o certificado (apenas válido com a opção -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Se as chaves são para serem encriptadas:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE\tficheiro que contém o PIN de encriptação\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tvalor do PIN\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Argumentos opcionais:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Certificado das configurações:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAME\tnome a atribuir ao pedido\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g SIZE\ttamanho da chave a ser gerada se uma já não estiver em uso\n"
+msgstr ""
+"  -g SIZE\ttamanho da chave a ser gerada se uma já não estiver em uso\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\ttentativa de renovação do certificado quando a expiração se aproxima (por defeito)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\ttentativa de renovação do certificado quando a expiração se aproxima "
+"(por defeito)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tnão tentar renovar o certificado quando a expiração se aproxima\n"
+msgstr ""
+"  -R\t\tnão tentar renovar o certificado quando a expiração se aproxima\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tusar o CA especificado em vez do por defeito\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parâmetros para o pedido de assinatura:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NAME\tdefine o nome do assunto pretendido (omissão: CN=<hostname>)\n"
+msgstr ""
+"  -N NAME\tdefine o nome do assunto pretendido (omissão: CN=<hostname>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\tdefinir a utilização de chave estendida OID pedida\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME\tdefinir nome principal solicitado\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNSNAME\tdefinir o nome de DNS solicitado\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EMAIL\tdefinir o endereço de correio electrónico solicitado\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Opções Bus:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tliga ao serviço certmonger no sistema bus\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tliga ao serviço certmonger no bus de sessão\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Outras opções:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\treportar todos os detalhes de erros\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Uso: %s start-tracking [opções]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Se a modificar um pedido existente:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME\tnome de um pedido de monitorização existente\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Se as chaves forem encriptadas:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME\tnome a dar ao pedido de monitorização\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parâmetros para o pedido de assinatura no tempo de renovação:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U EXTUSAGE\tsobrescreve a utilização de chave estendida OID pedida\n"
+msgstr ""
+"  -U EXTUSAGE\tsobrescreve a utilização de chave estendida OID pedida\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME\tsobrescreve nome principal pedido\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME\tsobrescreve nome DNS pedido\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\tsobrescreve endereço de e-mail pedido\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Uso: %s stop-tracking [options]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Pelo identificador do pedido:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME\tnome para o pedido de monitorização\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Uso: %s resubmit [opções]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE\tficheiro PEM para certificado\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Novos valores do parâmetro para o pedido de assinatura:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME\tnovo nome a dar ao pedido de monitorização\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tusar o CA especificado em vez do actual\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Uso: %s list [opções]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Opções gerais:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA\tlistar apenas pedidos e certificados associados a este CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tlista apenas informações sobre pedidos pendentes\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tlistar apenas informação sobre certificados monitorozados\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Se a selecionar um pedido especifico:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIR\tlistar apenas pedidos e certificados que utilizem esta base de dados NSS\n"
+msgstr ""
+"  -d DIR\tlistar apenas pedidos e certificados que utilizem esta base de "
+"dados NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAME\tlistar apenas pedidos e certificados que utilizem esta alcunha\n"
+msgstr ""
+"  -n NAME\tlistar apenas pedidos e certificados que utilizem esta alcunha\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FILE\tlistar apenas pedidos e certificados armazenados neste ficheiro PEM\n"
+msgstr ""
+"  -f FILE\tlistar apenas pedidos e certificados armazenados neste ficheiro "
+"PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tliga ao serviço certmonger no sistema bus\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tliga ao serviço certmonger no bus de sessão\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Uso: %s list-cas [opções]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\tlistar apenas informação sobre o CA com este nome\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: comando não reconhecido\n"
@@ -987,13 +1016,14 @@ msgstr "Incapaz de determinar a localização do servidor XMLRPC do CA.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1046,7 +1076,8 @@ msgstr "\t-f         converter em daemon\n"
 
 #: src/main.c:128
 msgid "\t-b TIMEOUT bus-activated, idle timeout\n"
-msgstr "\t-b TEMPORIZADOR activado-por-barramento, temporizador de inactividade\n"
+msgstr ""
+"\t-b TEMPORIZADOR activado-por-barramento, temporizador de inactividade\n"
 
 #: src/main.c:129
 msgid "\t-B         don't use an idle timeout\n"
@@ -1064,7 +1095,7 @@ msgstr "\t-p FIC    escrever PID do serviço para ficheiro\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Ocorreu um erro interno."
 
@@ -1088,7 +1119,7 @@ msgstr "Tipo de armazenamento do certificado \"%s\" não suportado."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "A localização \"%s\" tem de ser um caminho absoluto."
@@ -1119,7 +1150,8 @@ msgstr "A localização \"%s\" tem de ser um ficheiro."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1132,7 +1164,7 @@ msgstr "A localização \"%s\" tem de ser uma directoria."
 msgid "Certificate nickname not specified."
 msgstr "Nome do certificado não especificado."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Já existe um pedido com o nome \"%s\"."
@@ -1140,9 +1172,10 @@ msgstr "Já existe um pedido com o nome \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Certificado na mesma localização já é utilizado para pedidos com alcunha \"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Certificado na mesma localização já é utilizado para pedidos com alcunha \"%s"
+"\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1160,7 +1193,8 @@ msgstr "Nome da chave não especificado."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Chave na mesma localização já é utilizada para pedidos com alcunha \"%s\"."
+msgstr ""
+"Chave na mesma localização já é utilizada para pedidos com alcunha \"%s\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1171,20 +1205,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "CA desconhecido."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Autoridade de certificação \"%s\" desconhecida."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Parâmetro desconhecido ou tipo de valor incorrecto."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3690b03..be00a44 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cleiton Lima <cleitoncfl@yahoo.com.br>, 2011
 # Fábio Olivé Leite <fabio.olive@gmail.com>, 2013
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/certmonger/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"certmonger/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -39,8 +40,8 @@ msgstr "Erro de criação para XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Erro ao analisar resposta do servidor.\n"
@@ -98,14 +99,18 @@ msgstr "Erro interno: nenhuma resposta para \"%s?%s\".\n"
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Caminho \"%s\" não é absoluto, tente usar o \"%s\" em vez disso.\n\n"
+msgstr ""
+"Caminho \"%s\" não é absoluto, tente usar o \"%s\" em vez disso.\n"
+"\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Caminho \"%s\" não é absoluto, e houve um erro ao determinar o nome do diretório atual.\n"
+msgstr ""
+"Caminho \"%s\" não é absoluto, e houve um erro ao determinar o nome do "
+"diretório atual.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -140,7 +145,9 @@ msgstr "Erro ao conectar-se ao DBus.\n"
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
 msgid "Please verify that the message bus (D-Bus) service is running.\n"
-msgstr "Por favor verifique se o serviço de barramento de mensagens (D-Bus) está em execução.\n"
+msgstr ""
+"Por favor verifique se o serviço de barramento de mensagens (D-Bus) está em "
+"execução.\n"
 
 #: src/getcert.c:282
 #, c-format
@@ -155,7 +162,9 @@ msgstr "Erro %s: %s\n"
 #: src/getcert.c:328
 #, c-format
 msgid "Error %s\n"
-msgstr "Erro %s\n\n"
+msgstr ""
+"Erro %s\n"
+"\n"
 
 #: src/getcert.c:334
 #, c-format
@@ -172,7 +181,7 @@ msgstr "Recebida reposta com erro do serviço local %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Nenhuma resposta recebida do serviço %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -213,13 +222,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Erro a não analisar o nome principal do Kerberos \"%s\":%s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requer um argumento -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- '%c'\n"
@@ -230,7 +239,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Erro: argumento extra não utilizado \"%s\".\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Erro: Argumentos extras não utilizados foram fornecidos.\n"
@@ -243,12 +252,16 @@ msgstr "Localização do banco de dados ou login especificado sem o outro\n"
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
 msgid "Database directory and certificate file both specified.\n"
-msgstr "Diretório do banco de dados e arquivo de certificado, ambos especificados\n"
+msgstr ""
+"Diretório do banco de dados e arquivo de certificado, ambos especificados\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Nenhum diretório e login de banco de dados ou arquivo de certificado especificado.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Nenhum diretório e login de banco de dados ou arquivo de certificado "
+"especificado.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -258,12 +271,14 @@ msgstr "A chave e o certificado não podem ser salvos no mesmo arquivo.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "O backend IPA requer o uso da opção -K (nome do principal) quando a opção -N (nome do subject) é usada.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"O backend IPA requer o uso da opção -K (nome do principal) quando a opção -N "
+"(nome do subject) é usada.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Nenhum CA com o nome \"%s\" encontrado.\n"
@@ -292,14 +307,18 @@ msgstr "Nova requisição de rastreamento \"%s\" adicionada.\n"
 #: src/getcert.c:1430
 #, c-format
 msgid "New tracking request could not be added.\n"
-msgstr "Nova requisição de rastreamento não foi adicionada.\n\n"
+msgstr ""
+"Nova requisição de rastreamento não foi adicionada.\n"
+"\n"
 
 #: src/getcert.c:1668 src/getcert.c:2418
 #, c-format
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Nenhum ID, diretório da base de dados e nome de usuário ou arquivo de certificados especificados.\n"
+msgstr ""
+"Nenhum ID, diretório da base de dados e nome de usuário ou arquivo de "
+"certificados especificados.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -311,12 +330,12 @@ msgstr "Pedido \"%s\" modificado.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Requisição \"%s\" não podia ser modificada.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Nenhum pedido encontrado com apelido especificado.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Nenhuma requisição encontrada que tenha argumentos correspondentes.\n"
@@ -356,605 +375,664 @@ msgstr "Erro ao tentar enviar \"%s\" para \"%s\".\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Erro ao tentar enviar \"%s\".\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Números de certificados e pedidos sendo rastreados: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "ID do Pedido '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\"status:%s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\"ca-error:%s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\ttravado: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tarmazenamento do par de chave: tipo=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "NADA"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",localização='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",apelido='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfile='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertificado: tipo=%s,localização='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\temitente: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tsubject: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\texpiração: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\temail: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tnome do principal: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "\tEndereço IP: "
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tuso da key: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr "\troot certificados salvo para os arquivos:\n"
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr "\toutro root certificados salvos para os arquivos:\n"
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr "\toutros certificados salvos para os arquivos:\n"
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr "\troot certificados salvos para o banco de dados:\n"
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr "\toutro root certificados salvos para os bancos de dados:\n"
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr "\toutros certificados salvos para os bancos de dados:\n"
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tpre-salva comando: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tpost-salva comando: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tfaixa: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-renovar: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr "\tself-identifies como: %s\n"
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-tipo: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tajuda-localização: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tpróximo-serial-número: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tnomes-conhecidos-emitente:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr "\tconhecidos perfis/modelos/certificados:\n"
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr "\tpadrão perfil/modelo/certificadotipo: %s\n"
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
-msgstr "\terro ao atualizar o dado de CA\n\n"
+msgstr ""
+"\terro ao atualizar o dado de CA\n"
+"\n"
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - ferramenta de inscrição de certificado cliente\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Uso: %s pedido [opções]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Argumentos necessários:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "Se estiver utilizando uma base de dados NSS para armazenamento:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR\tBanco de dados NSS para chave e certificado\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n NOME \tapelido para NSS-based armazenamento (válido somente com -d)\n"
+msgstr ""
+"  -n NOME \tapelido para NSS-based armazenamento (válido somente com -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NOME\tnome de token opcional para NSS-based armazenamento (válido somente com -d)\n"
+msgstr ""
+"  -t NOME\tnome de token opcional para NSS-based armazenamento (válido "
+"somente com -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Se estiver utilizando arquivos para armazenamento:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k ARQUIVO\tPEM arquivo para chave privada\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f ARQUIVO\tPEM arquivo para certificado (válido somente com -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Se as chaves devem ser criptografadas:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p ARQUIVO\tarquivo que mantém a criptografia PIN\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN valor\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Argumentos opcionais:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Configurações de manejo de certificado:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NOME\tapelido para atribuir ao pedido\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr "  -G TIPO\ttipo de chave para a gerada se um já não esta no local\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g TAMANHO\ttamanho da chave a ser gerada se um já não está neste lugar\n"
+msgstr ""
+"  -g TAMANHO\ttamanho da chave a ser gerada se um já não está neste lugar\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\ttentativa de renovar o certificado quando o vencimento se aproximar (padrão)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\ttentativa de renovar o certificado quando o vencimento se aproximar "
+"(padrão)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tnão tente renovar o certificado quando se aproxima da expiração\n"
+msgstr ""
+"  -R\t\tnão tente renovar o certificado quando se aproxima da expiração\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tuse o CA especificado ao invés do padrão\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PERFIL\tperguntar o CA processar a requisição usando o modelo ou perfil nomeado\n"
+msgstr ""
+"  -T PERFIL\tperguntar o CA processar a requisição usando o modelo ou perfil "
+"nomeado\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parâmetros para a solicitação de assinatura:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
-msgstr "  -N NOME\tnome do assunto solicitado em conjunto (padrão: CN=<hostname>)\n"
+msgstr ""
+"  -N NOME\tnome do assunto solicitado em conjunto (padrão: CN=<hostname>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE conjunto solicitado prolongado uso de chave OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\tdefine requisição o valor de uso da chave\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
-msgstr "  -K NOME\tconjunto solicitado para o nome principal\n\n"
+msgstr ""
+"  -K NOME\tconjunto solicitado para o nome principal\n"
+"\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
-msgstr "  -D DNSNAME\tconjunto solicitado para o nome do DNS \n\n"
+msgstr ""
+"  -D DNSNAME\tconjunto solicitado para o nome do DNS \n"
+"\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
-msgstr "  -E EMAIL\tconjunto solicitado para o endereço de email\n\n"
+msgstr ""
+"  -E EMAIL\tconjunto solicitado para o endereço de email\n"
+"\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
-msgstr "  -A ENDEREÇO\tdefinido requisição de endereço IP\n\n"
+msgstr ""
+"  -A ENDEREÇO\tdefinido requisição de endereço IP\n"
+"\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
-msgstr "* Bus opções:\n\n"
+msgstr ""
+"* Bus opções:\n"
+"\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
-msgstr "  -S\t\tconnectado para o serviço de certmonger sobre o barramento do sistema\n"
+msgstr ""
+"  -S\t\tconnectado para o serviço de certmonger sobre o barramento do "
+"sistema\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s\t\tconnectado para o serviço de certmonger sobre o barramento da sessão\n"
+msgstr ""
+"  -s\t\tconnectado para o serviço de certmonger sobre o barramento da "
+"sessão\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Outras opções:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
-msgstr "  -B\tcomando para rodar antes de salvar o certificado\n\n"
+msgstr ""
+"  -B\tcomando para rodar antes de salvar o certificado\n"
+"\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
-msgstr "  -C\tcomando para rodar após salvar o certificado\n\n"
+msgstr ""
+"  -C\tcomando para rodar após salvar o certificado\n"
+"\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr "  -F\tarquivo para armazenar certificados CA's\n"
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
-msgstr "  -a\tNSS banco de dados para armazenar certificados CA's\n\n"
+msgstr ""
+"  -a\tNSS banco de dados para armazenar certificados CA's\n"
+"\n"
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
-msgstr "  -v\treportar todos os detalhes de erros\n\n"
+msgstr ""
+"  -v\treportar todos os detalhes de erros\n"
+"\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
-msgstr "Use: %s start-tracking [opções]\n\n"
+msgstr ""
+"Use: %s start-tracking [opções]\n"
+"\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Se estiver modificando um pedido existente:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NOME\tapelido de uma solicitação de rastreamento existente\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Se as chaves são criptografadas:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NOME\tapelido para dar à solicitação de rastreamento\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parâmetros para a solicitação de assinatura em tempo de renovação:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE\tsubstituir requisição extendida para uso de chave OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NOME\tsubstituir o nome principal requerido\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
-msgstr "  -D DNSNAME\tsubstituir requisição do nome do DNS\n\n"
+msgstr ""
+"  -D DNSNAME\tsubstituir requisição do nome do DNS\n"
+"\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
-msgstr "  -E EMAIL\tsubstituir requisição do endereço de email\n\n"
+msgstr ""
+"  -E EMAIL\tsubstituir requisição do endereço de email\n"
+"\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
-msgstr "  -A ENDEREÇO\tsobreescreve requisição de endereço IP\n\n"
+msgstr ""
+"  -A ENDEREÇO\tsobreescreve requisição de endereço IP\n"
+"\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Use: %s stop-tracking [opções]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Por identificador de requisição:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
-msgstr "  -i NOME\tapelido para rastreamento de requisição\n\n"
+msgstr ""
+"  -i NOME\tapelido para rastreamento de requisição\n"
+"\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Uso: %s reenvio [opções]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
-msgstr "  -f ARQUIVO\tPEM arquivo para o certificado\n\n"
+msgstr ""
+"  -f ARQUIVO\tPEM arquivo para o certificado\n"
+"\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Novos valores de parâmentro para o pedido de assinatura:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NOME\tnovo apelido para dar a solicitação de rastreamento\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tuse o CA especificado ao invés do atual\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Uso: %s lista [opções]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Opções gerais:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tlistar somente solicitações e certificados associados com esta CA\n"
+msgstr ""
+"  -c CA\tlistar somente solicitações e certificados associados com esta CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tlistar somente informações sobre solicitações pendentes\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tlistar somente informações sobre certificados rastreados\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Se selecionado um pedido específico:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d DIRETÓRIO\tsomente lista as requisições e os certificados que usam este NSS como banco de dados\n"
+msgstr ""
+"  -d DIRETÓRIO\tsomente lista as requisições e os certificados que usam este "
+"NSS como banco de dados\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NOME\tsomente lista requisições e certificados que usem este apelido\n\n"
+msgstr ""
+"  -n NOME\tsomente lista requisições e certificados que usem este apelido\n"
+"\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f ARQUIVO\tsomente lista as requisições e os certificados armazenadas neste arquivo PEM\n\n"
+msgstr ""
+"  -f ARQUIVO\tsomente lista as requisições e os certificados armazenadas "
+"neste arquivo PEM\n"
+"\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
-msgstr "  -S\tconectado para o serviço de certmonger sob o barramento do sistema\n"
+msgstr ""
+"  -S\tconectado para o serviço de certmonger sob o barramento do sistema\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s\tconectado para o serviço de certmonger sob a sessão do barramento\n"
+msgstr ""
+"  -s\tconectado para o serviço de certmonger sob a sessão do barramento\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Use: %s list-cas [opções]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\tlista informações somente sobre o CA com este nome\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr "Uso: %s refresh-ca [opções]\n"
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
-msgstr "  -c CA\tatualizar informação sobre a CA com este nome\n\n"
+msgstr ""
+"  -c CA\tatualizar informação sobre a CA com este nome\n"
+"\n"
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: comando não reconhecido\n"
@@ -977,7 +1055,8 @@ msgstr "A opção -K não pode ser usada com a opção -k ou com a opção -t.\n
 #: src/ipa.c:238
 #, c-format
 msgid "Unable to determine principal name for signing request.\n"
-msgstr "Não é possível determinar o nome principal para solicitação de assinatura.\n"
+msgstr ""
+"Não é possível determinar o nome principal para solicitação de assinatura.\n"
 
 #: src/ipa.c:255
 #, c-format
@@ -987,36 +1066,46 @@ msgstr "Não foi possível determinar a localização do servidor XMLRPC do CA.\
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Erro definido ccache para serviço de \"host\" no cliente usando o padrão keytab: %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Erro definido ccache para serviço de \"host\" no cliente usando o padrão "
+"keytab: %s.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Erro definido ccache para \"%s\" no cliente usando o padrão keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Erro definido ccache para \"%s\" no cliente usando o padrão keytab: %s.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Erro definido ccache para \"host\" no cliente usando keytab \"%s\": %s.\n"
+msgstr ""
+"Erro definido ccache para \"host\" no cliente usando keytab \"%s\": %s.\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Erro definido ccache para \"%s\" no cliente usando keytab \"%s\": %s.\n"
+msgstr ""
+"Erro definido ccache para \"%s\" no cliente usando keytab \"%s\": %s.\n"
 
 #: src/ipa.c:348
 #, c-format
 msgid "Error setting up for XMLRPC on the client.\n"
-msgstr "Erro definido para XMLRPC no cliente.\n\n"
+msgstr ""
+"Erro definido para XMLRPC no cliente.\n"
+"\n"
 
 #: src/ipa.c:428
 #, c-format
 msgid "Unable to determine location of IPA LDAP server.\n"
-msgstr "Não foi possível determinar a localização do servidor IPA LDAP server.\n\n"
+msgstr ""
+"Não foi possível determinar a localização do servidor IPA LDAP server.\n"
+"\n"
 
 #: src/ipa.c:490
 #, c-format
@@ -1030,19 +1119,27 @@ msgstr "Uso: %s [-s|-S] [-n|-f] [-d NÍVEL] [-p ARQUIVO] [-F]\n"
 
 #: src/main.c:124
 msgid "\t-s         use session bus\n"
-msgstr "\t-s         use a sessão do barramento\n\n"
+msgstr ""
+"\t-s         use a sessão do barramento\n"
+"\n"
 
 #: src/main.c:125
 msgid "\t-S         use system bus\n"
-msgstr "\t-S         use o sistema do barramento\n\n"
+msgstr ""
+"\t-S         use o sistema do barramento\n"
+"\n"
 
 #: src/main.c:126
 msgid "\t-n         don't become a daemon\n"
-msgstr "\t-n         não se torna um daemon\n\n"
+msgstr ""
+"\t-n         não se torna um daemon\n"
+"\n"
 
 #: src/main.c:127
 msgid "\t-f         do become a daemon\n"
-msgstr "\t-f         torna-se um daemon\n\n"
+msgstr ""
+"\t-f         torna-se um daemon\n"
+"\n"
 
 #: src/main.c:128
 msgid "\t-b TIMEOUT bus-activated, idle timeout\n"
@@ -1050,11 +1147,15 @@ msgstr "\t-b TIMEOUT bus-activated, idle timeout\n"
 
 #: src/main.c:129
 msgid "\t-B         don't use an idle timeout\n"
-msgstr "\t-B         não use um timeout oscioso\n\n"
+msgstr ""
+"\t-B         não use um timeout oscioso\n"
+"\n"
 
 #: src/main.c:130
 msgid "\t-d LEVEL   set debugging level (implies -n)\n"
-msgstr "\t-d NIVEL   define depuração de nível(implica -n)\n\n"
+msgstr ""
+"\t-d NIVEL   define depuração de nível(implica -n)\n"
+"\n"
 
 #: src/main.c:131
 msgid "\t-p FILE    write service PID to file\n"
@@ -1064,7 +1165,7 @@ msgstr "\t-p ARQUIVO    escreve serviço para o arquivo PID\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         força NSS no FIPS modo\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Um erro interno ocorreu."
 
@@ -1088,7 +1189,7 @@ msgstr "Tipo de armazenamento de certificado \"%s\" não suportado."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "O local de \"%s\" deve ser um caminho absoluto."
@@ -1103,7 +1204,9 @@ msgstr "Localização do armazenamento de certificado não especificada."
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "O pai da localização \"%s\" não pode ser acessado devido a permissões insuficientes."
+msgstr ""
+"O pai da localização \"%s\" não pode ser acessado devido a permissões "
+"insuficientes."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1119,8 +1222,10 @@ msgstr "A localização \"%s\" deve ser um arquivo."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
-msgstr "A localização \"%s\" não pode ser acessada devido a permissões insuficientes."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
+msgstr ""
+"A localização \"%s\" não pode ser acessada devido a permissões insuficientes."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
 #: src/tdbush.c:1145
@@ -1132,7 +1237,7 @@ msgstr "A localização \"%s\" deve ser um diretório."
 msgid "Certificate nickname not specified."
 msgstr "Nome de usuário do certificado não especificado."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Já existe um pedido com o nome de usuário \"%s\"."
@@ -1140,9 +1245,10 @@ msgstr "Já existe um pedido com o nome de usuário \"%s\"."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Certificado no mesmo local já é utilizado por requisição com o apelido de "
 "\"%s\"."
-msgstr "Certificado no mesmo local já é utilizado por requisição com o apelido de \"%s\"."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1160,7 +1266,8 @@ msgstr "Nome de usuário da chave não foi especificado."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Chave no mesmo local já é utilizado por solicitação com o apelido de \"%s\"."
+msgstr ""
+"Chave no mesmo local já é utilizado por solicitação com o apelido de \"%s\"."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1171,20 +1278,20 @@ msgstr "Sem suporte para tipo de chave \"%s\"."
 msgid "No such CA."
 msgstr "Não há tal CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Autoridade do certificado \"%s\" não conhecida."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Parâmetro não reconhecido ou tipo de valor errado."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Erro ao analisar argumentos."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Nome da propriedade não é reconhecida."
 
diff --git a/po/ro.po b/po/ro.po
index 09eaae5..1bae087 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/certmonger/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/certmonger/"
+"language/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index c47ab6f..f41342e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Stanislav Darchinov <darchinov@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/certmonger/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/certmonger/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -36,8 +38,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -102,7 +104,9 @@ msgstr ""
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Путь \"%s\" не является абсолютным, определение имени текущего каталога было выполнено с ошибками.\n"
+msgstr ""
+"Путь \"%s\" не является абсолютным, определение имени текущего каталога было "
+"выполнено с ошибками.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -137,7 +141,8 @@ msgstr "Ошибка подключения к DBus.\n"
 #: src/getcert.c:275 src/tdbusm.c:1963
 #, c-format
 msgid "Please verify that the message bus (D-Bus) service is running.\n"
-msgstr "Пожалуйста, проверьте, что служба шины сообщений (D-Bus) выполняется.\n"
+msgstr ""
+"Пожалуйста, проверьте, что служба шины сообщений (D-Bus) выполняется.\n"
 
 #: src/getcert.c:282
 #, c-format
@@ -169,7 +174,7 @@ msgstr "Получен ошибочный ответ от службы %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "От службы %s не был получен ответ.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +215,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +232,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,8 +249,10 @@ msgstr "Не определены каталог базы данных и фай
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Не определены ни каталог базы данных, ни никнейм или файл сертификата.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Не определены ни каталог базы данных, ни никнейм или файл сертификата.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -255,12 +262,12 @@ msgstr "Ключи и сертификат не могут быть сохран
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "CA с именем \"%s\" не найден.\n"
@@ -296,7 +303,8 @@ msgstr ""
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Не были опрделены ни ID базы данных, ни никнейм или файл сертификата.\n"
+msgstr ""
+"Не были опрделены ни ID базы данных, ни никнейм или файл сертификата.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -308,12 +316,12 @@ msgstr "Запрос \"%s\" изменен.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Запрос \"%s\" не может быть изменен.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +361,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Запрос ID '%s':\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>статус: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-ошибка: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>тема: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>истекает: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "неизвестный"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>email: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>dns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-тип: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Необходимый аргументы:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* В случае использования для хранения базы данных NSS:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* В случае использования файлов для хранения:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* В случае, если ключи шифруются:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Необязательный аргументы:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Новые значения параметров запроса на подписание:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Основные опции:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: неизвестная команда\n"
@@ -984,13 +993,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1071,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Произошла внутренняя ошибка."
 
@@ -1085,7 +1095,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1126,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1140,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1148,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1178,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2c41ca3..85f292e 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/fedora/"
@@ -37,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -228,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -262,7 +262,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -310,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -355,606 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1089,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1172,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/si.po b/po/si.po
index 706d1bb..46530b6 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Sinhala (http://www.transifex.com/projects/p/certmonger/language/si/)\n"
+"Language-Team: Sinhala (http://www.transifex.com/projects/p/certmonger/"
+"language/si/)\n"
+"Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 551782a..530ffd8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/certmonger/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/certmonger/"
+"language/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index d201b50..c076f75 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/certmonger/language/sl/)\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/certmonger/"
+"language/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 5142eee..6a07234 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/certmonger/language/sq/)\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/certmonger/"
+"language/sq/)\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 2a08dcc..4b02952 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/certmonger/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/certmonger/"
+"language/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index f1402b7..51aa59c 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,21 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/certmonger/language/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/"
+"certmonger/language/sr@latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -35,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index d11cbc6..9343aa5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Göran Uddeborg <goeran@uddeborg.se>, 2011-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/certmonger/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/certmonger/"
+"language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr "Fel vid inställning av XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Fel vid tolkning av svar från servern.\n"
@@ -102,7 +103,9 @@ msgstr "Sökvägen ”%s” är inte absolut, försöker använda ”%s” istä
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Sökvägen ”%s” är inte absolut, och det uppstod ett fel när namnet på den aktuella katalogen skulle bestämmas.\n"
+msgstr ""
+"Sökvägen ”%s” är inte absolut, och det uppstod ett fel när namnet på den "
+"aktuella katalogen skulle bestämmas.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -122,7 +125,9 @@ msgstr "Sökväg ”%s”: %s.\n"
 #: src/getcert.c:171
 #, c-format
 msgid "Path \"%s\" is not a regular file.\n"
-msgstr "Sökvägen ”%s” är inte normal fil.\n\n"
+msgstr ""
+"Sökvägen ”%s” är inte normal fil.\n"
+"\n"
 
 #: src/getcert.c:248
 #, c-format
@@ -169,7 +174,7 @@ msgstr "Mottog felsvar från den lokala tjänsten %s.\n"
 msgid "No response received from %s service.\n"
 msgstr "Inget svar mottaget från tjänsten %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +215,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Fel vid avtolkning av Kerberos-huvudnamn ”%s”: %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: felaktig flagga -- ”%c”\n"
@@ -227,7 +232,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Fel: oanvänt extra argument ”%s”.\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Fel: oanvända extra argument gavs.\n"
@@ -244,7 +249,8 @@ msgstr "Databaskatalog och certifikatfil båda angivna.\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr "Ingen av databaskatalog och smeknamn eller certifikatfil angiven.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +261,14 @@ msgstr "Nyckeln och certifikatet kan inte båda sparas i samma fil.\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "IPA-backänden kräver användning av -K-flaggan (huvudnamn) när -N-flaggan (ämnesnamn) används.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"IPA-backänden kräver användning av -K-flaggan (huvudnamn) när -N-flaggan "
+"(ämnesnamn) används.\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Ingen CA med namnet ”%s” hittades.\n"
@@ -296,7 +304,9 @@ msgstr "Nya spårningsbegäran kunde inte läggas till.\n"
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Ingen av ID eller databaskatalog och smeknamn eller certifikatfil filen angiven.\n"
+msgstr ""
+"Ingen av ID eller databaskatalog och smeknamn eller certifikatfil filen "
+"angiven.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -308,12 +318,12 @@ msgstr "Begäran ”%s” ändrad.\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Begäran ”%s” kunde inte ändras.\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Ingen begäran hittades med angivet smeknamn.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Ingen begäran hittades som matchade argumenten.\n"
@@ -353,605 +363,620 @@ msgstr "Fel vid försök att skicka ”%s” till ”%s”.\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Fel vid försök att skicka ”%s”.\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Antalet certifikat och spårade begäran: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Begärans-id ”%s”:\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tstatus: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-fel: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tfastnat: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tnyckelparslagring: typ=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "INGEN"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",plats=”%s”"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",smeknamn=”%s”"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",symbol=”%s”"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin=”%s”"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pin-fil=”%s”"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tcertifikat: typ=%s,plats=”%s”"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tutgivare: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tämne: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tlöper ut: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "okänt"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\te-post: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\thuvudnamn: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tnyckelanvändning: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tkommando före det sparas: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tkommando efter det sparas: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tspår: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tauto-förnyelse: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA ”%s”:\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-typ: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\thjälparplats: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tnästa-serienummer: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tkänt utfärdarnamn:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - registreringsverktyg för klientcertifikat\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Användning: %s request [flaggor]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Obligatoriska argument:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Om du använder en NSS-databas för lagring:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d KAT\tNSS-databas för nyckel och cert\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr "  -n NAMN\tsmeknamn för NSS-baserad lagring (endast giltigt med -d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t NAMN\tfrivilligt symbolnamn för NSS-baserad lagring (endast giltig med -d)\n"
+msgstr ""
+"  -t NAMN\tfrivilligt symbolnamn för NSS-baserad lagring (endast giltig med -"
+"d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Om du använder filer för lagring:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FIL\tPEM-fil för privat nyckel\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FIL\tPEM-fil för certifikat (endast giltigt med -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Om nycklar skall krypteras:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FIL\tfil som håller PIN för kryptering\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN-värde\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Valfria argument:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Inställningar för certifikathantering:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I NAMN\tsmeknamn att tilldela till begäran\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g STORLEK\tstorlek på nyckel som skall genereras om det inte redan finns en\n"
+msgstr ""
+"  -g STORLEK\tstorlek på nyckel som skall genereras om det inte redan finns "
+"en\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tförsök att förnya certifikatet när utgångsdatumet närmar sig (standard)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tförsök att förnya certifikatet när utgångsdatumet närmar sig "
+"(standard)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tförsök inte förnya certifikatet när utgångsdatumet närmar sig\n"
+msgstr ""
+"  -R\t\tförsök inte förnya certifikatet när utgångsdatumet närmar sig\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA\t\tanvänd angiven CA istället för standard\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T PROFIL\tbe CA:n att bearbeta begäran med användning av den angivna profilen eller mallen\n"
+msgstr ""
+"  -T PROFIL\tbe CA:n att bearbeta begäran med användning av den angivna "
+"profilen eller mallen\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Parametrar för signeringsbegäran:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N NAMN\tställ in begärt ämnesnamn (standard: CN=<värdnamn>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTANV\tställ in begärd förlängd nyckelanvändning-OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u NYCELANVÄNDNING\tsätt angivet värde på nyckelanvändning\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAMN\tställ in begärt huvudnamn\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D DNS-NAMN\tställ in begärt DNS-namn\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E EPOST\tställ in begärd e-postadress\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Bussflaggor:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\t\tanslut till tjänsten certmonger på systembussen\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\t\tanslut till tjänsten certmonger på sessionsbussen\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Andra flaggor:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tkommando att köra före certifikatet sparas\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tkommando att köra efter certifikatet sparas\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\trapportera alla detaljer om fel\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Användning: %s start-tracking [flaggor]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* Om du ändrar en befintlig begäran:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAMN\tsmeknamn på en befintlig spårningsbegäran\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Om nycklarna är krypterade:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAMN\tsmeknamn att ge på spårningbegäran\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Parametrar för signeringsbegäran vid förnyelsetidpunkten:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTANV\tåsidosätt begärd förlängd nyckelanvändning-OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAMN\tåsidosätt begärt huvudnamn\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNS-NAMN\tåsidosätt begärt DNS-namn\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL\tåsidosätt begärd e-postadress\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Användning: %s stop-tracking [flaggor]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* Enligt identifierare för begäran:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAMN\tsmeknamn för spårningsbegäran\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Användning: %s resubmit [flaggor]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FIL\tPEM-fil för certifikat\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Nya parametervärden för signeringsbegäran:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAMN\tnytt smeknamn för att ge till spårningsbegäran\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA\t\tanvänd den angivna CA:n istället för den nuvarande\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Användning: %s list [flaggor]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Allmänna flaggor:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tlista endast begäran och certifikat associerade med denna CA\n"
+msgstr ""
+"  -c CA\tlista endast begäran och certifikat associerade med denna CA\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tlista endast information om utestående begäran\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t\tlista endast information om spårade certifikat\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* Om du väljer en viss begäran:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d KAT\tlista endast begäran och certifikat som använder denna NSS-databas\n"
+msgstr ""
+"  -d KAT\tlista endast begäran och certifikat som använder denna NSS-"
+"databas\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n NAMN\tlista endast begäran och certifikat som använder detta smeknamn\n"
+msgstr ""
+"  -n NAMN\tlista endast begäran och certifikat som använder detta smeknamn\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f FIL\tlista endast begäran och certifikat lagrade i denna PEM-fil\n"
+msgstr ""
+"  -f FIL\tlista endast begäran och certifikat lagrade i denna PEM-fil\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S\tanslut till tjänsten certmonger på systembussen\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s\tanslut till tjänsten certmonger på sessionsbussen\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Användning: %s list-cas [flaggor]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA\tlista endast information om CA:n med detta namn\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: okänt kommando\n"
@@ -984,13 +1009,14 @@ msgstr "Det går inte att bestämma plats för CA:ns XMLRPC-server.\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1087,7 @@ msgstr "\t-p FIL     skriv tjänstens PID till filen\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         tvinga in NSS i FIPS-läge\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Ett internt fel har uppstått."
 
@@ -1085,7 +1111,7 @@ msgstr "Lagringstyp ”%s” för certifikat stödjs inte."
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Platsen ”%s” måste vara en absolut sökväg."
@@ -1116,7 +1142,8 @@ msgstr "Platsen ”%s” måste vara en fil."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1156,7 @@ msgstr "Platsen ”%s” måste vara en katalog."
 msgid "Certificate nickname not specified."
 msgstr "Certifikatsmeknamn inte angivet."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Det finns redan en begäran med smeknamnet ”%s”."
@@ -1137,9 +1164,9 @@ msgstr "Det finns redan en begäran med smeknamnet ”%s”."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Certifikat på samma plats används redan av av begäran med smeknamnet ”%s”."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Certifikat på samma plats används redan av av begäran med smeknamnet ”%s”."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1168,20 +1195,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "Ingen sådan CA."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Certifikatmyndighet ”%s” inte känd."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Okända parameter eller fel värdetyp."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 1431eb7..491910d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Felix I <ifelix25@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/certmonger/language/ta/)\n"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/certmonger/"
+"language/ta/)\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -308,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -984,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ta_IN.po b/po/ta_IN.po
index 08c4944..2d82ae8 100644
--- a/po/ta_IN.po
+++ b/po/ta_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/fedora/"
@@ -36,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -261,7 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -309,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,606 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1064,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1133,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1171,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 75bf1d3..6659671 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/certmonger/language/te/)\n"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/certmonger/"
+"language/te/)\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/tg.po b/po/tg.po
index 1c3f382..9df5264 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Tajik (http://www.transifex.com/projects/p/certmonger/language/tg/)\n"
+"Language-Team: Tajik (http://www.transifex.com/projects/p/certmonger/"
+"language/tg/)\n"
+"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 3a471bb..46fd2a4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Thai (http://www.transifex.com/projects/p/certmonger/language/th/)\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/certmonger/language/"
+"th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/tl.po b/po/tl.po
index 7481d14..6b833b5 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Tagalog (http://www.transifex.com/projects/p/certmonger/language/tl/)\n"
+"Language-Team: Tagalog (http://www.transifex.com/projects/p/certmonger/"
+"language/tl/)\n"
+"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index d4684b8..648ac58 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Hasan Alp İNAN <hasanalpinan@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/certmonger/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/certmonger/"
+"language/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -36,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -169,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -210,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -227,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -244,7 +245,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -255,12 +257,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -308,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -353,605 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>durum: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-hatası: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>CA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>eposta: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>dns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s':\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "<span class=\"whitespace other\" title=\"Tab\">»</span>ca-tipi: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -984,13 +987,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1116,7 +1120,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1129,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1137,8 +1142,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1168,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 57befc2..606132b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Nalin Dahyabhai <nalin@fedoraproject.org>, 2011
 # Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
@@ -10,15 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 20:08+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/certmonger/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/certmonger/"
+"language/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
 #, c-format
@@ -38,8 +40,8 @@ msgstr "Помилка встановлення XMLRPC.\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "Помилка обробки відповіді сервера.\n"
@@ -57,12 +59,15 @@ msgstr "Надіслано запит щодо поновлення, але не
 #: src/dogtag.c:366
 #, c-format
 msgid "No end-entity URL (-E) given, and no default known.\n"
-msgstr "Не вказано завершального запису адреси (-E), типове значення запису також невідоме.\n"
+msgstr ""
+"Не вказано завершального запису адреси (-E), типове значення запису також "
+"невідоме.\n"
 
 #: src/dogtag.c:370
 #, c-format
 msgid "No agent URL (-A) given, and no default known.\n"
-msgstr "Не вказано адреси агента (-A), типове значення адреси також невідоме.\n"
+msgstr ""
+"Не вказано адреси агента (-A), типове значення адреси також невідоме.\n"
 
 #: src/dogtag.c:374
 #, c-format
@@ -97,14 +102,17 @@ msgstr "Внутрішня помилка: немає відповіді на «
 #: src/getcert.c:92
 #, c-format
 msgid "Path \"%s\" is not absolute, attempting to use \"%s\" instead.\n"
-msgstr "Шлях «%s» не є абсолютним, спробуємо замість нього скористатися «%s».\n"
+msgstr ""
+"Шлях «%s» не є абсолютним, спробуємо замість нього скористатися «%s».\n"
 
 #: src/getcert.c:97
 #, c-format
 msgid ""
 "Path \"%s\" is not absolute, and there was an error determining the name of "
 "the current directory.\n"
-msgstr "Шлях «%s» не є абсолютним, спроба визначення назви поточного каталогу також зазнала невдачі.\n"
+msgstr ""
+"Шлях «%s» не є абсолютним, спроба визначення назви поточного каталогу також "
+"зазнала невдачі.\n"
 
 #: src/getcert.c:119
 #, c-format
@@ -171,7 +179,7 @@ msgstr "Отримано повідомлення про помилку від �
 msgid "No response received from %s service.\n"
 msgstr "Не отримано відповіді від служби %s.\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr "Стан %s, прив’язка: %s.\n"
@@ -212,13 +220,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "Помилка під час пакування реєстраційного запису Kerberos «%s»: %s.\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: разом з параметром слід вказати аргумент -- «%c»\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: некоректний параметр — «%c»\n"
@@ -229,7 +237,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "Помилка: зайвий аргумент «%s».\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "Помилка: було вказано невикористовувані зайві аргументи.\n"
@@ -237,7 +245,9 @@ msgstr "Помилка: було вказано невикористовуван
 #: src/getcert.c:809 src/getcert.c:1653 src/getcert.c:1860 src/getcert.c:2142
 #, c-format
 msgid "Database location or nickname specified without the other.\n"
-msgstr "Вказано адресу бази даних або псевдонім без визначення іншого необхідного елемента.\n"
+msgstr ""
+"Вказано адресу бази даних або псевдонім без визначення іншого необхідного "
+"елемента.\n"
 
 #: src/getcert.c:815 src/getcert.c:1659 src/getcert.c:1866 src/getcert.c:2148
 #, c-format
@@ -246,8 +256,10 @@ msgstr "Одночасно вказано каталог бази даних і 
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
-msgstr "Не вказано ні каталогу бази даних з псевдонімом, ні файла сертифіката.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
+msgstr ""
+"Не вказано ні каталогу бази даних з псевдонімом, ні файла сертифіката.\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
 #, c-format
@@ -257,12 +269,14 @@ msgstr "Ключ і сертифікат не можна зберігати у �
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
-msgstr "Сервер IPA потребує використання параметра -K (назви реєстраційного запису), якщо використано параметр -N (призначення).\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
+msgstr ""
+"Сервер IPA потребує використання параметра -K (назви реєстраційного запису), "
+"якщо використано параметр -N (призначення).\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "Не виявлено служби сертифікації (CA) з назвою «%s».\n"
@@ -298,7 +312,9 @@ msgstr "Не вдалося додати новий запит щодо стеж
 msgid ""
 "None of ID or database directory and nickname or certificate file "
 "specified.\n"
-msgstr "Не вказано ні ідентифікатора, ні каталогу бази даних з псевдонімом, ні файла сертифіката.\n"
+msgstr ""
+"Не вказано ні ідентифікатора, ні каталогу бази даних з псевдонімом, ні файла "
+"сертифіката.\n"
 
 #: src/getcert.c:1841
 #, c-format
@@ -310,12 +326,12 @@ msgstr "Змінено запит «%s».\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "Не вдалося змінити запит «%s».\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "Не виявлено запиту з вказаним псевдонімом.\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "Запиту, що відповідає аргументам, не виявлено.\n"
@@ -355,605 +371,646 @@ msgstr "Помилка під час спроби надсилання «%s» д
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "Помилка під час спроби надсилання «%s».\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr "Оновлюємо ідентифікатор запиту «%s».\n"
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr "Не оновлюємо ідентифікатор запиту «%s».\n"
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "Кількість сертифікатів та запитів, за якими ведеться стеження: %d.\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "Ідентифікатор запиту «%s»:\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\tстан: %s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-помилка: %s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "\tприв’язка: %s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "\tсховище пар ключів: тип=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "Немає"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",розташування=«%s»"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",псевдонім=«%s»"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",ключ=«%s»"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",пін-код=«%s»"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",пін-файл=«%s»"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\tсертифікат: тип=%s,розташування=«%s»"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA: %s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "\tвидавець: %s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "\tпризначення: %s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\tзавершення дії: %s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "невідоме"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\tел. пошта: "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns: "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tреєстраційний запис: "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr "\tIP-адреса: "
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\tвикористання ключа: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku: "
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr "\tкореневі сертифікати, збережені до файлів:\n"
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr "\tінші кореневі сертифікати, збережені до файлів:\n"
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr "\tінші сертифікати, збережені до файлів:\n"
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr "\tкореневі сертифікати, збережені до баз даних:\n"
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr "\tінше кореневі файли, збережені до баз даних:\n"
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr "\tінші сертифікати, збережені до баз даних:\n"
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\tкоманда до збереження: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\tкоманда після збереження: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\tстеження: %s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\tавтооновлення: %s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "Служба сертифікації «%s»:\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr "\tсамоідентифікація: %s\n"
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-тип: %s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\tадреса допоміжної програми: %s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\tнаступний серійний номер: %s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tвідомі назви видавця:\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr "\tвідомі профілі, шаблони, типи сертифікатів:\n"
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr "\tтиповий профіль, шаблон або тип сертифіката: %s\n"
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr "Не вказано ні псевдоніма CA, ні прапорця -a.\n"
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr "Оновлюємо дані для CA «%s».\n"
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr "Оновлюємо дані для CA без назви.\n"
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr "\tпомилка під час спроби оновлення даних CA\n"
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s — інструмент реєстрації клієнтських сертифікатів\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "Використання: %s request [параметри]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "Обов’язкові аргументи:\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* Якщо для зберігання даних використовується база даних NSS:\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d КАТАЛОГ\tБаза даних ключів і сертифікатів NSS\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
-msgstr "  -n НАЗВА\tпсевдонім сховища на основі NSS (працюватиме, лише якщо вказано -d)\n"
+msgstr ""
+"  -n НАЗВА\tпсевдонім сховища на основі NSS (працюватиме, лише якщо вказано -"
+"d)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t НАЗВА\tдодаткова назва ключа до заснованого на NSS сховища (працюватиме, лише якщо вказано -d)\n"
+msgstr ""
+"  -t НАЗВА\tдодаткова назва ключа до заснованого на NSS сховища "
+"(працюватиме, лише якщо вказано -d)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* Якщо для зберігання даних використовуються файли:\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k ФАЙЛ\tФайл PEM закритого ключа\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f ФАЙЛ\tФайл PEM сертифіката (працюватиме, лише якщо вказано -k)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* Якщо ключі слід зашифрувати:\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p ФАЙЛ\tФайл, у якому зберігається PIN-код шифрування\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tЗначення PIN-коду шифрування\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "Необов’язкові аргументи:\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* Параметри обробки сертифікатів:\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr "  -I НАЗВА\tпсевдонім, який слід пов’язати з запитом\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
-msgstr "  -G ТИП\tтип ключа, який слід створити, якщо не буде виявлено готового\n"
+msgstr ""
+"  -G ТИП\tтип ключа, який слід створити, якщо не буде виявлено готового\n"
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
-msgstr "  -g РОЗМІР\tрозмір ключа, який слід створити, якщо не буде виявлено готового, у бітах\n"
+msgstr ""
+"  -g РОЗМІР\tрозмір ключа, який слід створити, якщо не буде виявлено "
+"готового, у бітах\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
-msgstr "  -r\t\tСпробувати оновити сертифікат, якщо наближається завершення строку дії (типова поведінка)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+msgstr ""
+"  -r\t\tСпробувати оновити сертифікат, якщо наближається завершення строку "
+"дії (типова поведінка)\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
-msgstr "  -R\t\tНе намагатися оновити сертифікат, якщо наближається завершення строку дії\n"
+msgstr ""
+"  -R\t\tНе намагатися оновити сертифікат, якщо наближається завершення "
+"строку дії\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
-msgstr "  -c CA\t\tвикористовувати вказану службу сертифікації (CA), а не типову\n"
+msgstr ""
+"  -c CA\t\tвикористовувати вказану службу сертифікації (CA), а не типову\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
-msgstr "  -T ПРОФІЛЬ\tпопросити CA обробити запит з використанням вказаного профілю або шаблона\n"
+msgstr ""
+"  -T ПРОФІЛЬ\tпопросити CA обробити запит з використанням вказаного профілю "
+"або шаблона\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* Параметри запиту щодо підписування:\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N НАЗВА\tВстановити бажане призначення (Типово: CN=<назва вузла>)\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
-msgstr "  -U ДОД.ВИКОР.\tВстановити додаткове використання ключа за допомогою OID\n"
+msgstr ""
+"  -U ДОД.ВИКОР.\tВстановити додаткове використання ключа за допомогою OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u ВИКОРИСТАННЯ встановити вказане значення використання ключа\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K НАЗВА\tВстановити вказану назву реєстраційного запису\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "  -D НАЗВА-DNS\tвстановити вказану назву за DNS\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "  -E ЕЛ.ПОШТА\tвстановити вказану адресу електронної пошти\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr "  -A АДРЕСА\tвстановити вказану IP-адресу\n"
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* Параметри каналу зв’язку:\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
-msgstr "  -S\t\tВстановити зв’язок зі службою certmonger за допомогою системного каналу\n"
+msgstr ""
+"  -S\t\tВстановити зв’язок зі службою certmonger за допомогою системного "
+"каналу\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s\t\tВстановити зв’язок зі службою certmonger за допомогою каналу сеансу\n"
+msgstr ""
+"  -s\t\tВстановити зв’язок зі службою certmonger за допомогою каналу сеансу\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* Інші параметри:\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\tкоманда, яку слід виконати до збереження сертифіката\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\tкоманда, яку слід виконати після збереження сертифіката\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr "  -F\tфайл, у якому слід зберігати сертифікати CA\n"
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr "  -a\tбаза даних NSS, у якій слід зберігати сертифікати CA\n"
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr "  -w\tспробувати зачекати на момент випуску сертифіката\n"
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\tповідомляти про всі дані щодо помилок\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "Використання: %s start-tracking [параметри]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* У разі зміни існуючого запиту:\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i НАЗВА\tПсевдонім існуючого запиту щодо стеження\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* Якщо ключі зашифровано:\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I НАЗВА\tПсевдонім, який слід пов’язати з запитом щодо стеження\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* Параметри запиту щодо підписування під час оновлення:\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
-msgstr "  -U ДОД.ВИКОР.\tПеревизначити додаткове використання ключа за допомогою OID\n"
+msgstr ""
+"  -U ДОД.ВИКОР.\tПеревизначити додаткове використання ключа за допомогою "
+"OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K НАЗВА\tПеревизначити вказану назву реєстраційного запису\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D НАЗВА-DNS\tПеревизначити вказану назву за DNS\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E ЕЛ.ПОШТА\tПеревизначити вказану адресу електронної пошти\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr "  -A АДРЕСА\tперевизначити вказану IP-адресу\n"
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "Використання: %s stop-tracking [параметри]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* За ідентифікатором запиту:\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i НАЗВА\tПсевдонім запиту щодо стеження\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "Використання: %s resubmit [параметри]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f ФАЙЛ\tФайл PEM сертифіката\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* Нові значення параметрів запиту щодо підписування:\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
-msgstr "  -I НАЗВА\tНовий псевдонім, який слід пов’язати з запитом щодо стеження\n"
+msgstr ""
+"  -I НАЗВА\tНовий псевдонім, який слід пов’язати з запитом щодо стеження\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
-msgstr "  -c CA\t\tВикористовувати вказану службу сертифікації (CA), а не поточну\n"
+msgstr ""
+"  -c CA\t\tВикористовувати вказану службу сертифікації (CA), а не поточну\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "Використання: %s list [параметри]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* Загальні параметри:\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
-msgstr "  -c CA\tПоказати список лише тих запитів та сертифікатів, які пов’язано з вказаною службою сертифікації (CA)\n"
+msgstr ""
+"  -c CA\tПоказати список лише тих запитів та сертифікатів, які пов’язано з "
+"вказаною службою сертифікації (CA)\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r\tПоказати лише відомості щодо нетипових запитів\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
-msgstr "  -t\tПоказати лише відомості щодо сертифікатів, за якими ведеться стеження\n"
+msgstr ""
+"  -t\tПоказати лише відомості щодо сертифікатів, за якими ведеться стеження\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* У разі вибору певного запиту:\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d КАТАЛОГ\tпоказувати список лише тих запитів і сертифікатів, які використовують цю базу даних NSS\n"
+msgstr ""
+"  -d КАТАЛОГ\tпоказувати список лише тих запитів і сертифікатів, які "
+"використовують цю базу даних NSS\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -d НАЗВА\tпоказувати список лише тих запитів і сертифікатів, які використовують цю назву\n"
+msgstr ""
+"  -d НАЗВА\tпоказувати список лише тих запитів і сертифікатів, які "
+"використовують цю назву\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f ФАЙЛ\tпоказувати список лише тих запитів і сертифікатів, які зберігаються у цьому файлі PEM\n"
+msgstr ""
+"  -f ФАЙЛ\tпоказувати список лише тих запитів і сертифікатів, які "
+"зберігаються у цьому файлі PEM\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
-msgstr "  -S\tВстановити зв’язок зі службою certmonger за допомогою системного каналу\n"
+msgstr ""
+"  -S\tВстановити зв’язок зі службою certmonger за допомогою системного "
+"каналу\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
-msgstr "  -s\tВстановити зв’язок зі службою certmonger за допомогою каналу сеансу\n"
+msgstr ""
+"  -s\tВстановити зв’язок зі службою certmonger за допомогою каналу сеансу\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr "Користування: %s refresh [параметри]\n"
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr "  -a   \tоновити дані щодо усіх незвичайних запитів\n"
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr "Користування: %s status [параметри]\n"
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr "* Вибір певного запиту:\n"
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr "* Якщо використовуємо базу даних NSS для зберігання:\n"
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr "  -d КАТ\tповернути стан для запиту у вказаній базі даних NSS\n"
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
-msgstr "  -n НАЗВА\tповернути стан для сертифіката, який використовує вказаний псевдонім\n"
+msgstr ""
+"  -n НАЗВА\tповернути стан для сертифіката, який використовує вказаний "
+"псевдонім\n"
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr "* Якщо використовуємо файли для зберігання даних:\n"
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
-msgstr "  -f ФАЙЛ\tповернути стан для сертифіката, що зберігається у вказаному файлі PEM\n"
+msgstr ""
+"  -f ФАЙЛ\tповернути стан для сертифіката, що зберігається у вказаному файлі "
+"PEM\n"
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "Використання: %s list-cas [параметри]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
-msgstr "  -c CA\tПоказати лише відомості щодо служби сертифікації (CA) з вказаною назвою\n"
+msgstr ""
+"  -c CA\tПоказати лише відомості щодо служби сертифікації (CA) з вказаною "
+"назвою\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr "Користування: %s refresh-ca [параметри]\n"
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr "  -c CA\tоновити дані щодо CA із вказаною назвою\n"
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr "  -a   \tоновити дані щодо усіх відомих CA\n"
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s: невідома команда\n"
@@ -976,7 +1033,8 @@ msgstr "Параметр -K не можна використовувати ра�
 #: src/ipa.c:238
 #, c-format
 msgid "Unable to determine principal name for signing request.\n"
-msgstr "Не вдалося визначити назву реєстраційного запису запиту щодо підписування.\n"
+msgstr ""
+"Не вдалося визначити назву реєстраційного запису запиту щодо підписування.\n"
 
 #: src/ipa.c:255
 #, c-format
@@ -986,26 +1044,35 @@ msgstr "Не вдалося визначити адресу сервера XMLRP
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
-msgstr "Помилка встановлення ccache для служби «host» на боці клієнта за допомогою типового сховища ключів: %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
+msgstr ""
+"Помилка встановлення ccache для служби «host» на боці клієнта за допомогою "
+"типового сховища ключів: %s.\n"
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
-msgstr "Помилка встановлення ccache для «%s» на боці клієнта за допомогою типової таблиці ключів: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgstr ""
+"Помилка встановлення ccache для «%s» на боці клієнта за допомогою типової "
+"таблиці ключів: %s.\n"
 
 #: src/ipa.c:317
 #, c-format
 msgid ""
 "Error setting up ccache for \"host\" service on client using keytab \"%s\": "
 "%s.\n"
-msgstr "Помилка встановлення ccache для служби «host» на боці клієнта за допомогою сховища ключів «%s»: %s.\n"
+msgstr ""
+"Помилка встановлення ccache для служби «host» на боці клієнта за допомогою "
+"сховища ключів «%s»: %s.\n"
 
 #: src/ipa.c:321
 #, c-format
 msgid "Error setting up ccache for \"%s\" on client using keytab \"%s\": %s.\n"
-msgstr "Помилка встановлення ccache для «%s» на боці клієнта за допомогою сховища ключів «%s»: %s.\n"
+msgstr ""
+"Помилка встановлення ccache для «%s» на боці клієнта за допомогою сховища "
+"ключів «%s»: %s.\n"
 
 #: src/ipa.c:348
 #, c-format
@@ -1045,7 +1112,9 @@ msgstr "\t-f         запустити у режимі фонової служ�
 
 #: src/main.c:128
 msgid "\t-b TIMEOUT bus-activated, idle timeout\n"
-msgstr "\t-b ЧАС_ОЧІКУВАННЯ задіяння каналу даних, час очікування у стані бездіяльності\n"
+msgstr ""
+"\t-b ЧАС_ОЧІКУВАННЯ задіяння каналу даних, час очікування у стані "
+"бездіяльності\n"
 
 #: src/main.c:129
 msgid "\t-B         don't use an idle timeout\n"
@@ -1063,7 +1132,7 @@ msgstr "\t-p ФАЙЛ    записати PID служби до файла\n"
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         примусово перевести NSS у режим FIPS\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "Сталася внутрішня помилка."
 
@@ -1087,7 +1156,7 @@ msgstr "Підтримки типу сховищ сертифікатів «%s»
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "Адресою «%s» має бути абсолютний шлях."
@@ -1102,7 +1171,8 @@ msgstr "Адресу сховища сертифікатів не вказано
 msgid ""
 "The parent of location \"%s\" could not be accessed due to insufficient "
 "permissions."
-msgstr "Батьківська тека адреси «%s» недоступна через недостатні права доступу."
+msgstr ""
+"Батьківська тека адреси «%s» недоступна через недостатні права доступу."
 
 #: src/tdbush.c:539 src/tdbush.c:783 src/tdbush.c:990 src/tdbush.c:1090
 #: src/tdbush.c:1190
@@ -1118,7 +1188,8 @@ msgstr "Адресою «%s» має бути файл."
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr "Адреса «%s» недоступна через недостатні права доступу."
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1131,7 +1202,7 @@ msgstr "Адресою «%s» має бути каталог."
 msgid "Certificate nickname not specified."
 msgstr "Псевдонім сертифіката не вказано."
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "Запит з псевдонімом «%s» вже існує."
@@ -1139,9 +1210,9 @@ msgstr "Запит з псевдонімом «%s» вже існує."
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
-msgstr "Сертифікат з цією адресою вже використовується за запитом з псевдонімом «%s»."
+"Certificate at same location is already used by request with nickname \"%s\"."
+msgstr ""
+"Сертифікат з цією адресою вже використовується за запитом з псевдонімом «%s»."
 
 #: src/tdbush.c:731
 #, c-format
@@ -1159,7 +1230,8 @@ msgstr "Псевдонім ключа не вказано."
 #: src/tdbush.c:906
 #, c-format
 msgid "Key at same location is already used by request with nickname \"%s\"."
-msgstr "Ключ з цією адресою вже використовується за запитом з псевдонімом «%s»."
+msgstr ""
+"Ключ з цією адресою вже використовується за запитом з псевдонімом «%s»."
 
 #: src/tdbush.c:1277
 #, c-format
@@ -1170,26 +1242,28 @@ msgstr "Підтримки ключів типу «%s» не передбаче�
 msgid "No such CA."
 msgstr "Такої служби сертифікації (CA) не виявлено."
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "Невідома служба сертифікації «%s»."
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "Невідомий параметр або помилковий тип значення."
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr "Помилка під час спроби обробити аргументи."
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr "Нерозпізнана назва властивості."
 
 #: src/tdbusm.c:1953
 msgid "Insufficient access.  Please retry operation as root.\n"
-msgstr "Недостатні права доступу. Будь ласка, повторіть дію від імені користувача root.\n"
+msgstr ""
+"Недостатні права доступу. Будь ласка, повторіть дію від імені користувача "
+"root.\n"
 
 #: src/tdbusm.c:1957
 msgid "Please verify that the certmonger service has been started.\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 60face8..4561d00 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-03-24 16:29+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/"
@@ -37,8 +37,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +211,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -228,7 +228,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -262,7 +262,7 @@ msgid ""
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -310,12 +310,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -355,606 +355,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
+#: src/getcert.c:3346 src/getcert.c:3392
 msgid ""
 "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1089,7 +1089,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1172,20 +1172,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/ur.po b/po/ur.po
index f3c4ad8..dc84cf7 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Urdu (http://www.transifex.com/projects/p/certmonger/language/ur/)\n"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/certmonger/language/"
+"ur/)\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/uz.po b/po/uz.po
index 3442891..fc52ffa 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Uzbek (http://www.transifex.com/projects/p/certmonger/language/uz/)\n"
+"Language-Team: Uzbek (http://www.transifex.com/projects/p/certmonger/"
+"language/uz/)\n"
+"Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 6a6d1f8..ae89a9f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/certmonger/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/certmonger/"
+"language/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/wo.po b/po/wo.po
index 48d2f11..fd45652 100644
--- a/po/wo.po
+++ b/po/wo.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Wolof (http://www.transifex.com/projects/p/certmonger/language/wo/)\n"
+"Language-Team: Wolof (http://www.transifex.com/projects/p/certmonger/"
+"language/wo/)\n"
+"Language: wo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: wo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/xh.po b/po/xh.po
index 137cdf3..b408f64 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Xhosa (http://www.transifex.com/projects/p/certmonger/language/xh/)\n"
+"Language-Team: Xhosa (http://www.transifex.com/projects/p/certmonger/"
+"language/xh/)\n"
+"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: xh\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f2df837..dbeb255 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # alanzheng <machinecat1666@gmail.com>, 2011
 # Huan Chen <chenhuan126@126.com>, 2011
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/certmonger/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
+"certmonger/language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -42,8 +43,8 @@ msgstr "设置 xmlrpc 时出错。\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "分析服务器响应时出错。\n"
@@ -175,7 +176,7 @@ msgstr "从本地 %s 服务收到错误响应。\n"
 msgid "No response received from %s service.\n"
 msgstr "没有从 %s 服务收到响应。\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -216,13 +217,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr "反解析 Kerberos 主机名 “%s”时出错：%s。\n"
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 操作需要一个参数 -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 无效的选项 -- '%c'\n"
@@ -233,7 +234,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr "错误：未使用的额外参数 \"%s\"。\n"
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr "错误：输入了额外未使用的参数。\n"
@@ -250,7 +251,8 @@ msgstr "数据库目录和证书文件都已指定。\n"
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr "没有指定数据库目录和别名，或证书文件。\n"
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -261,12 +263,12 @@ msgstr "密钥和证书不能保存到同一个文件。\n"
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr "当使用 -N 选项（主题名）时，IPA 后端要求使用 -K 选项（实体名）。\n"
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "没有找到具有名称“%s”的 CA.\n"
@@ -314,12 +316,12 @@ msgstr "请求 “%s”已修改。\n"
 msgid "Request \"%s\" could not be modified.\n"
 msgstr "请求“%s”无法修改。\n"
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "未找到包含指定昵称的请求。\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr "没有找到匹配参数的请求。\n"
@@ -359,605 +361,614 @@ msgstr "试图提交“%s”到“%s”时出错。\n"
 msgid "Error attempting to submit \"%s\".\n"
 msgstr "试图提交“%s”时出错。\n"
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr "正在跟踪的证书和请求数量：%d\n"
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "请求 ID '%s'：\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "    状态：%s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "    CA 错误：%s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr "    死机：%s\n"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr "    密钥对存储：type=%s"
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "无"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ",location='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ",nickname='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ",token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ",pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ",pinfile='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "证书：type=%s,location='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "    CA：%s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr "    发行者：%s\n"
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr "    主题：%s\n"
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "    到期时间：%s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "未知"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "    电子邮件： "
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "    DNS： "
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "    实体名： "
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr "\t密钥用法: %s\n"
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "    EKU："
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr "\t保存前命令: %s\n"
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr "\t保存后命令: %s\n"
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "    跟踪：%s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "    自动更新：%s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA '%s'：\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "    CA 类型：%s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "    helper 位置：%s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "    下个序列号：%s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "    已知发行者名称：\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - 客户端证书登记工具\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "用法：%s request [options]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "所需参数：\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* 如果使用 NSS 数据库作为存储：\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d DIR    密钥和证书的NSS 数据库\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr "  -n NAME    基于 NSS 的存储的别名（只在同时使用 -d 时有效）\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr "-t NAME    基于 NSS 的存储的可选令牌名（只在同时使用 -d 时有效）\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* 如果使用文件作为存储：\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k FILE    私钥的PEM 文件\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f FILE    证书的 PEM 文件（只在同时使用 -k 时有效）\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* 如果密钥要被加密：\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p FILE    保存加密 PIN 的文件\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN    PIN 值\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "可选参数：\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* 证书处理设置：\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
-msgstr "  -I NAME    要分配给请求的别名\n\n"
+msgstr ""
+"  -I NAME    要分配给请求的别名\n"
+"\n"
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr "  -g SIZE    要生成的密钥大小，如果密钥不存在\n"
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr "  -r     在临近到期时试图更新证书（默认）\n"
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr "  -R    不在临近到期时试图更新证书\n"
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr "  -c CA    使用指定的 CA 而不是默认 CA\n"
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr "  -T 预置文件\t要求 CA 使用指名的预置文件或模板处理请求\n"
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr "* 签名请求的参数：\n"
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr "  -N NAME     设定所需的主题名（默认：CN=<主机名>）\n"
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE    设定所需的扩展密钥使用 OID\n"
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr "  -u KEYUSAGE\t设定请求的密钥用法值\n"
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr "  -K NAME    设定所需实体名\n"
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr "   -D DNSNAME    设定所需的 DNS 名\n"
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr "    -E EMAIL    设定所需的电子邮件地址\n"
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* 总线选项：\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S    在系统总线上连接到的 certmonger 服务\n"
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s    在会话总线上连接到的 certmonger 服务\n"
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* 其他选项：\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr "  -B\t在保存证书前运行的命令\n"
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr "  -C\t在保存证书后运行的命令\n"
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v    报告所有错误细节\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "用法：%s start-tracking [options]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr "* 如果修改现存请求：\n"
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr "  -i NAME    现存跟踪请求的别名\n"
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* 如果密钥已加密：\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr "  -I NAME    要指定于跟踪请求的别名\n"
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr "* 签名请求在更新时的参数：\n"
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr "  -U EXTUSAGE    覆盖所需的扩展密钥使用 OID\n"
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr "  -K NAME    覆盖所需的实体名\n"
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr "  -D DNSNAME    覆盖所需的 DNS 名\n"
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr "  -E EMAIL    覆盖所需的电子邮件地址\n"
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "用法：%s stop-tracking [选项]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr "* 由请求标识符：\n"
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr "  -i NAME    跟踪请求的别名\n"
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "用法：%s resubmit [选项]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f FILE    证书的 PEM 文件\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr "* 签名请求的新参数值：\n"
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr "  -I NAME    要指定于跟踪请求的新别名\n"
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr "  -c CA    使用指定的 CA 而不是当前的\n"
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "用法：%s list [选项]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* 一般选项：\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA    只列出与此 CA 关联的请求和证书\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr "  -r    只列出未解决请求的相关信息\n"
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr "  -t    只列出被跟踪证书的相关信息\n"
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr "* 如果选择一个特定的需求：\n"
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
-msgstr "  -d 目录<span class=\"whitespace other\" title=\"Tab\">»</span>仅列出使用该 NSS 数据库的请求和认证\n"
+msgstr ""
+"  -d 目录<span class=\"whitespace other\" title=\"Tab\">»</span>仅列出使用该 "
+"NSS 数据库的请求和认证\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
-msgstr "  -n 名称<span class=\"whitespace other\" title=\"Tab\">»</span>仅显示使用该名称的请求和认证\n"
+msgstr ""
+"  -n 名称<span class=\"whitespace other\" title=\"Tab\">»</span>仅显示使用该"
+"名称的请求和认证\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
-msgstr "  -f 文件<span class=\"whitespace other\" title=\"Tab\">»</span>仅列出保存在此 PEM 文件中的请求和认证\n"
+msgstr ""
+"  -f 文件<span class=\"whitespace other\" title=\"Tab\">»</span>仅列出保存在"
+"此 PEM 文件中的请求和认证\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr "  -S    在系统总线上连接 certmonger 服务\n"
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr "  -s    在会话总线上连接 certmonger 服务\n"
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "用法：%s list-cas [选项]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr "  -c CA    只列出具有此名称的 CA 的相关信息\n"
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s：未识别命令\n"
@@ -965,7 +976,9 @@ msgstr "%s：未识别命令\n"
 #: src/ipa.c:151
 #, c-format
 msgid "The -t option can not be used with the -K option.\n"
-msgstr "选项 -t 不可跟选项 -K 共同使用。\n\n"
+msgstr ""
+"选项 -t 不可跟选项 -K 共同使用。\n"
+"\n"
 
 #: src/ipa.c:159
 #, c-format
@@ -990,13 +1003,14 @@ msgstr "无法确定 CA 的 XMLRPC 服务器的位置。\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1061,13 +1075,15 @@ msgstr "\t-d LEVEL   设定调试级别 (使用 -n)\n"
 
 #: src/main.c:131
 msgid "\t-p FILE    write service PID to file\n"
-msgstr "\t-p FILE    在文件中写入服务 PID\n\n"
+msgstr ""
+"\t-p FILE    在文件中写入服务 PID\n"
+"\n"
 
 #: src/main.c:132
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr "\t-F         强制 NSS 进入 FIPS 模式\n"
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "发生一个内部错误。"
 
@@ -1091,7 +1107,7 @@ msgstr "证书存储类型“%s”不支持。"
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "位置“%s”必须是绝对路径。"
@@ -1122,7 +1138,8 @@ msgstr "位置“%s”必须是文件。"
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1135,7 +1152,7 @@ msgstr "位置“%s”必须是目录。"
 msgid "Certificate nickname not specified."
 msgstr "证书别名没有指定。"
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "具有别名“%s”的请求已经存在。"
@@ -1143,8 +1160,7 @@ msgstr "具有别名“%s”的请求已经存在。"
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr "在相同位置的认证已经被包含昵称 \"%s\" 的请求使用。"
 
 #: src/tdbush.c:731
@@ -1174,20 +1190,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "没有该 CA。"
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "证书认证中心“%s”未知。"
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "未识别的参数或错误的值类型。"
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 684353e..04a7939 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/certmonger/language/zh_HK/)\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/"
+"certmonger/language/zh_HK/)\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9b91c43..79019f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2011
 # Walter Cheuk <wwycheuk@gmail.com>, 2012
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/certmonger/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
+"certmonger/language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -37,8 +38,8 @@ msgstr "設置 XMLRPC 時發生錯誤。\n"
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr "解析伺服器回應時發生錯誤。\n"
@@ -128,7 +129,9 @@ msgstr "\"%s\" 路徑並非普通檔案。\n"
 #: src/getcert.c:248
 #, c-format
 msgid "Out of memory.\n"
-msgstr "記憶體不足。\n\n"
+msgstr ""
+"記憶體不足。\n"
+"\n"
 
 #: src/getcert.c:274
 #, c-format
@@ -170,7 +173,7 @@ msgstr "從本地 %s 服務接收到錯誤回應。\n"
 msgid "No response received from %s service.\n"
 msgstr "沒有從 %s 服務接收到回應。\n"
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -211,13 +214,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項必需引數 -- '%c'\n"
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- '%c'\n"
@@ -228,7 +231,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -245,7 +248,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -256,12 +260,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr "找不到名稱為「%s」的 CA。\n"
@@ -309,12 +313,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr "找不到指定暱稱的請求。\n"
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -354,605 +358,608 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr "請求 ID「%s」：\n"
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr "\t狀態：%s\n"
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr "\tca-錯誤：%s\n"
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr "無"
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr "、位置='%s'"
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr "、暱稱='%s'"
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr "、token='%s'"
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr "、pin='%s'"
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr "、pin檔案='%s'"
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr "\t憑證：類型=%s、位置='%s'"
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr "\tCA：%s\n"
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr "\t失效日期：%s\n"
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr "未知"
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr "\t電郵："
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr "\tdns："
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr "\tprincipal 名稱："
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr "\teku："
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr "\ttrack：%s\n"
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr "\t自動更新：%s\n"
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr "CA「%s」：\n"
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr "\tca-類型：%s\n"
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr "\thelper-位置：%s\n"
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr "\t下個序號：%s\n"
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr "\tknown-issuer-names：\n"
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr "%s - 客戶端憑證註冊工具\n"
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr "用法：%s 請求 [選項]\n"
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr "請求的參數：\n"
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr "* 如以 NSS 資料庫作為儲存：\n"
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr "  -d 目錄\t金鑰及憑證的 NSS 資料庫\n"
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr "  -n 名稱\t基於 NSS 的儲存裝置的暱稱 (只有與 -d 一起用才有效)\n"
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
-msgstr "  -t 名稱\t基於 NSS 的儲存裝置的 token 名稱 (可有可無；只有與 -d 一起用才有效)\n"
+msgstr ""
+"  -t 名稱\t基於 NSS 的儲存裝置的 token 名稱 (可有可無；只有與 -d 一起用才有"
+"效)\n"
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr "* 如以檔案作為儲存：\n"
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr "  -k 檔案\t私鑰的 PEM 檔案\n"
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr "  -f 檔案\t憑證的 PEM 檔案 (只有與 -k 一起用才有效)\n"
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr "* 如金鑰要加密：\n"
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr "  -p 檔案\t儲存加密 PIN 的檔案\n"
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr "  -P PIN\tPIN 值\n"
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr "可有可無的引數：\n"
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr "* 憑證處理設定：\n"
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr "* 匯流排選項：\n"
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr "* 其他選項：\n"
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr "  -v\t報告錯誤的所有詳情\n"
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr "用法：%s start-tracking [選項]\n"
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr "* 如金鑰已加密：\n"
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr "用法：%s stop-tracking [選項]\n"
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr "用法：%s resubmit [選項]\n"
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr "  -f 檔案\t憑證的 PEM 檔案\n"
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr "用法：%s list [選項]\n"
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr "* 一般選項：\n"
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr "  -c CA\t只列出與此 CA 有關的請求與憑證\n"
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr "  -d 目錄\t只列出使用此 NSS 資料庫的請求及憑證\n"
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr "  -n 名稱\t只列出使用此暱稱的請求及憑證\n"
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr "  -f 檔案\t只列出儲存於此 PEM 檔案的請求及憑證\n"
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr "用法：%s list-cas [選項]\n"
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr "%s：指令無法辨識\n"
@@ -985,13 +992,14 @@ msgstr "無法判斷 CA 的 XMLRPC 伺服器的位置。\n"
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1062,7 +1070,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr "發生內部錯誤。"
 
@@ -1086,7 +1094,7 @@ msgstr "不支援憑證儲存類型 \"%s\"。"
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr "\"%s\" 位置須為絕對路徑。"
@@ -1117,7 +1125,8 @@ msgstr "\"%s\" 位置須為檔案。"
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1130,7 +1139,7 @@ msgstr "\"%s\" 位置須為目錄。"
 msgid "Certificate nickname not specified."
 msgstr "未指定憑證暱稱。"
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr "已有暱稱為 \"%s\" 的請求。"
@@ -1138,8 +1147,7 @@ msgstr "已有暱稱為 \"%s\" 的請求。"
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1169,20 +1177,20 @@ msgstr ""
 msgid "No such CA."
 msgstr "沒有這樣的 CA。"
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr "未知的憑證授權機構「%s」。"
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr "無法辨識的參數或錯誤的值類型。"
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""
 
diff --git a/po/zu.po b/po/zu.po
index 47a360c..6c4bbe1 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Red Hat, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: certmonger\n"
 "Report-Msgid-Bugs-To: certmonger-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2014-07-21 15:56-0400\n"
+"POT-Creation-Date: 2014-07-31 12:15-0400\n"
 "PO-Revision-Date: 2014-07-21 19:56+0000\n"
 "Last-Translator: Nalin Dahyabhai <nalin@fedoraproject.org>\n"
-"Language-Team: Zulu (http://www.transifex.com/projects/p/certmonger/language/zu/)\n"
+"Language-Team: Zulu (http://www.transifex.com/projects/p/certmonger/language/"
+"zu/)\n"
+"Language: zu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/certmaster.c:129 src/ipa.c:252
@@ -35,8 +36,8 @@ msgstr ""
 #: src/certmaster.c:198 src/getcert.c:373 src/getcert.c:392 src/getcert.c:411
 #: src/getcert.c:430 src/getcert.c:448 src/getcert.c:539 src/getcert.c:1094
 #: src/getcert.c:1417 src/getcert.c:1833 src/getcert.c:1915 src/getcert.c:2299
-#: src/getcert.c:2467 src/getcert.c:2493 src/getcert.c:2649 src/getcert.c:2736
-#: src/getcert.c:2771 src/getcert.c:2806 src/getcert.c:2825 src/getcert.c:3042
+#: src/getcert.c:2467 src/getcert.c:2492 src/getcert.c:2648 src/getcert.c:2735
+#: src/getcert.c:2770 src/getcert.c:2805 src/getcert.c:2824 src/getcert.c:3041
 #, c-format
 msgid "Error parsing server response.\n"
 msgstr ""
@@ -168,7 +169,7 @@ msgstr ""
 msgid "No response received from %s service.\n"
 msgstr ""
 
-#: src/getcert.c:544 src/getcert.c:3047
+#: src/getcert.c:544 src/getcert.c:3046
 #, c-format
 msgid "State %s, stuck: %s.\n"
 msgstr ""
@@ -209,13 +210,13 @@ msgid "Error unparsing Kerberos principal name \"%s\": %s.\n"
 msgstr ""
 
 #: src/getcert.c:787 src/getcert.c:1633 src/getcert.c:2108 src/getcert.c:2406
-#: src/getcert.c:2579 src/getcert.c:3003 src/getcert.c:3079 src/getcert.c:3257
+#: src/getcert.c:2578 src/getcert.c:3002 src/getcert.c:3078 src/getcert.c:3256
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
 #: src/getcert.c:791 src/getcert.c:1636 src/getcert.c:2111 src/getcert.c:2409
-#: src/getcert.c:2582 src/getcert.c:3006 src/getcert.c:3082 src/getcert.c:3260
+#: src/getcert.c:2581 src/getcert.c:3005 src/getcert.c:3081 src/getcert.c:3259
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
@@ -226,7 +227,7 @@ msgid "Error: unused extra argument \"%s\".\n"
 msgstr ""
 
 #: src/getcert.c:803 src/getcert.c:1647 src/getcert.c:2119 src/getcert.c:2424
-#: src/getcert.c:2590 src/getcert.c:3014 src/getcert.c:3090 src/getcert.c:3273
+#: src/getcert.c:2589 src/getcert.c:3013 src/getcert.c:3089 src/getcert.c:3272
 #, c-format
 msgid "Error: unused extra arguments were supplied.\n"
 msgstr ""
@@ -243,7 +244,8 @@ msgstr ""
 
 #: src/getcert.c:823 src/getcert.c:1874 src/getcert.c:2156
 #, c-format
-msgid "None of database directory and nickname or certificate file specified.\n"
+msgid ""
+"None of database directory and nickname or certificate file specified.\n"
 msgstr ""
 
 #: src/getcert.c:830 src/getcert.c:1675
@@ -254,12 +256,12 @@ msgstr ""
 #: src/getcert.c:856
 #, c-format
 msgid ""
-"The IPA backend requires the use of the -K option (principal name) when the "
-"-N option (subject name) is used.\n"
+"The IPA backend requires the use of the -K option (principal name) when the -"
+"N option (subject name) is used.\n"
 msgstr ""
 
 #: src/getcert.c:988 src/getcert.c:1383 src/getcert.c:1775 src/getcert.c:2176
-#: src/getcert.c:2431 src/getcert.c:2597
+#: src/getcert.c:2431 src/getcert.c:2596
 #, c-format
 msgid "No CA with name \"%s\" found.\n"
 msgstr ""
@@ -307,12 +309,12 @@ msgstr ""
 msgid "Request \"%s\" could not be modified.\n"
 msgstr ""
 
-#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2604 src/getcert.c:3021
+#: src/getcert.c:1853 src/getcert.c:2135 src/getcert.c:2603 src/getcert.c:3020
 #, c-format
 msgid "No request found with specified nickname.\n"
 msgstr ""
 
-#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2615 src/getcert.c:3032
+#: src/getcert.c:1901 src/getcert.c:2162 src/getcert.c:2614 src/getcert.c:3031
 #, c-format
 msgid "No request found that matched arguments.\n"
 msgstr ""
@@ -352,605 +354,606 @@ msgstr ""
 msgid "Error attempting to submit \"%s\".\n"
 msgstr ""
 
-#: src/getcert.c:2511
+#: src/getcert.c:2510
 #, c-format
 msgid "Request ID '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2513
+#: src/getcert.c:2512
 #, c-format
 msgid "Request ID '%s' NOT being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:2626
+#: src/getcert.c:2625
 #, c-format
 msgid "Number of certificates and requests being tracked: %d.\n"
 msgstr ""
 
-#: src/getcert.c:2758
+#: src/getcert.c:2757
 #, c-format
 msgid "Request ID '%s':\n"
 msgstr ""
 
-#: src/getcert.c:2759
+#: src/getcert.c:2758
 #, c-format
 msgid "\tstatus: %s\n"
 msgstr ""
 
-#: src/getcert.c:2763
+#: src/getcert.c:2762
 #, c-format
 msgid "\tca-error: %s\n"
 msgstr ""
 
-#: src/getcert.c:2765
+#: src/getcert.c:2764
 #, c-format
 msgid "\tstuck: %s\n"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 #, c-format
 msgid "\tkey pair storage: type=%s"
 msgstr ""
 
-#: src/getcert.c:2785
+#: src/getcert.c:2784
 msgid "NONE"
 msgstr ""
 
-#: src/getcert.c:2787
+#: src/getcert.c:2786
 #, c-format
 msgid ",location='%s'"
 msgstr ""
 
-#: src/getcert.c:2790 src/getcert.c:2812
+#: src/getcert.c:2789 src/getcert.c:2811
 #, c-format
 msgid ",nickname='%s'"
 msgstr ""
 
-#: src/getcert.c:2793 src/getcert.c:2815
+#: src/getcert.c:2792 src/getcert.c:2814
 #, c-format
 msgid ",token='%s'"
 msgstr ""
 
-#: src/getcert.c:2796
+#: src/getcert.c:2795
 #, c-format
 msgid ",pin='%s'"
 msgstr ""
 
-#: src/getcert.c:2799
+#: src/getcert.c:2798
 #, c-format
 msgid ",pinfile='%s'"
 msgstr ""
 
-#: src/getcert.c:2810
+#: src/getcert.c:2809
 #, c-format
 msgid "\tcertificate: type=%s,location='%s'"
 msgstr ""
 
-#: src/getcert.c:2830
+#: src/getcert.c:2829
 #, c-format
 msgid "\tCA: %s\n"
 msgstr ""
 
-#: src/getcert.c:2832
+#: src/getcert.c:2831
 #, c-format
 msgid "\tissuer: %s\n"
 msgstr ""
 
-#: src/getcert.c:2833
+#: src/getcert.c:2832
 #, c-format
 msgid "\tsubject: %s\n"
 msgstr ""
 
-#: src/getcert.c:2834
+#: src/getcert.c:2833
 #, c-format
 msgid "\texpires: %s\n"
 msgstr ""
 
-#: src/getcert.c:2837
+#: src/getcert.c:2836
 msgid "unknown"
 msgstr ""
 
-#: src/getcert.c:2840
+#: src/getcert.c:2839
 msgid "\temail: "
 msgstr ""
 
-#: src/getcert.c:2846
+#: src/getcert.c:2845
 msgid "\tdns: "
 msgstr ""
 
-#: src/getcert.c:2852
+#: src/getcert.c:2851
 msgid "\tprincipal name: "
 msgstr ""
 
-#: src/getcert.c:2860
+#: src/getcert.c:2859
 msgid "\tIP address: "
 msgstr ""
 
-#: src/getcert.c:2879
+#: src/getcert.c:2878
 #, c-format
 msgid "\tkey usage: %s\n"
 msgstr ""
 
-#: src/getcert.c:2883
+#: src/getcert.c:2882
 msgid "\teku: "
 msgstr ""
 
-#: src/getcert.c:2891 src/getcert.c:3154
+#: src/getcert.c:2890 src/getcert.c:3153
 #, c-format
 msgid "\troot certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2900 src/getcert.c:3163
+#: src/getcert.c:2899 src/getcert.c:3162
 #, c-format
 msgid "\tother root certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2909 src/getcert.c:3172
+#: src/getcert.c:2908 src/getcert.c:3171
 #, c-format
 msgid "\tother certificates saved to files:\n"
 msgstr ""
 
-#: src/getcert.c:2918 src/getcert.c:3181
+#: src/getcert.c:2917 src/getcert.c:3180
 #, c-format
 msgid "\troot certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2927 src/getcert.c:3190
+#: src/getcert.c:2926 src/getcert.c:3189
 #, c-format
 msgid "\tother root certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2936 src/getcert.c:3199
+#: src/getcert.c:2935 src/getcert.c:3198
 #, c-format
 msgid "\tother certificates saved to databases:\n"
 msgstr ""
 
-#: src/getcert.c:2941 src/getcert.c:3215
+#: src/getcert.c:2940 src/getcert.c:3214
 #, c-format
 msgid "\tpre-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2944 src/getcert.c:3221
+#: src/getcert.c:2943 src/getcert.c:3220
 #, c-format
 msgid "\tpost-save command: %s\n"
 msgstr ""
 
-#: src/getcert.c:2947
+#: src/getcert.c:2946
 #, c-format
 msgid "\ttrack: %s\n"
 msgstr ""
 
-#: src/getcert.c:2951
+#: src/getcert.c:2950
 #, c-format
 msgid "\tauto-renew: %s\n"
 msgstr ""
 
-#: src/getcert.c:3104
+#: src/getcert.c:3103
 #, c-format
 msgid "CA '%s':\n"
 msgstr ""
 
-#: src/getcert.c:3110
+#: src/getcert.c:3109
 #, c-format
 msgid "\tself-identifies as: %s\n"
 msgstr ""
 
-#: src/getcert.c:3119
+#: src/getcert.c:3118
 #, c-format
 msgid "\tca-type: %s\n"
 msgstr ""
 
-#: src/getcert.c:3121
+#: src/getcert.c:3120
 #, c-format
 msgid "\thelper-location: %s\n"
 msgstr ""
 
-#: src/getcert.c:3126
+#: src/getcert.c:3125
 #, c-format
 msgid "\tnext-serial-number: %s\n"
 msgstr ""
 
-#: src/getcert.c:3136
+#: src/getcert.c:3135
 #, c-format
 msgid "\tknown-issuer-names:\n"
 msgstr ""
 
-#: src/getcert.c:3145
+#: src/getcert.c:3144
 #, c-format
 msgid "\tknown profiles/templates/certtypes:\n"
 msgstr ""
 
-#: src/getcert.c:3208
+#: src/getcert.c:3207
 #, c-format
 msgid "\tdefault profile/template/certtype: %s\n"
 msgstr ""
 
-#: src/getcert.c:3268
+#: src/getcert.c:3267
 #, c-format
 msgid "Neither CA nickname nor -a flag specified.\n"
 msgstr ""
 
-#: src/getcert.c:3293
+#: src/getcert.c:3292
 #, c-format
 msgid "Data for CA '%s' being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3295
+#: src/getcert.c:3294
 #, c-format
 msgid "Data for unnamed CA being refreshed.\n"
 msgstr ""
 
-#: src/getcert.c:3298
+#: src/getcert.c:3297
 #, c-format
 msgid "\terror refreshing CA data\n"
 msgstr ""
 
-#: src/getcert.c:3324
+#: src/getcert.c:3323
 #, c-format
 msgid "%s - client certificate enrollment tool\n"
 msgstr ""
 
-#: src/getcert.c:3328
+#: src/getcert.c:3327
 #, c-format
 msgid "Usage: %s request [options]\n"
 msgstr ""
 
-#: src/getcert.c:3330 src/getcert.c:3376 src/getcert.c:3421 src/getcert.c:3443
-#: src/getcert.c:3515
+#: src/getcert.c:3329 src/getcert.c:3375 src/getcert.c:3420 src/getcert.c:3442
+#: src/getcert.c:3514
 msgid "Required arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
-#: src/getcert.c:3497 src/getcert.c:3518
+#: src/getcert.c:3330 src/getcert.c:3378 src/getcert.c:3423 src/getcert.c:3445
+#: src/getcert.c:3496 src/getcert.c:3517
 msgid "* If using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
-#: src/getcert.c:3519
+#: src/getcert.c:3331 src/getcert.c:3379 src/getcert.c:3424 src/getcert.c:3446
+#: src/getcert.c:3518
 msgid "  -d DIR\tNSS database for key and cert\n"
 msgstr ""
 
-#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
-#: src/getcert.c:3520
+#: src/getcert.c:3332 src/getcert.c:3380 src/getcert.c:3425 src/getcert.c:3447
+#: src/getcert.c:3519
 msgid "  -n NAME\tnickname for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
-#: src/getcert.c:3521
+#: src/getcert.c:3333 src/getcert.c:3381 src/getcert.c:3426 src/getcert.c:3448
+#: src/getcert.c:3520
 msgid ""
 "  -t NAME\toptional token name for NSS-based storage (only valid with -d)\n"
 msgstr ""
 
-#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428 src/getcert.c:3450
-#: src/getcert.c:3500 src/getcert.c:3522
+#: src/getcert.c:3334 src/getcert.c:3382 src/getcert.c:3427 src/getcert.c:3449
+#: src/getcert.c:3499 src/getcert.c:3521
 msgid "* If using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
+#: src/getcert.c:3335 src/getcert.c:3383 src/getcert.c:3428
 msgid "  -k FILE\tPEM file for private key\n"
 msgstr ""
 
-#: src/getcert.c:3337 src/getcert.c:3385 src/getcert.c:3430
+#: src/getcert.c:3336 src/getcert.c:3384 src/getcert.c:3429
 msgid "  -f FILE\tPEM file for certificate (only valid with -k)\n"
 msgstr ""
 
-#: src/getcert.c:3338
+#: src/getcert.c:3337
 msgid "* If keys are to be encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
+#: src/getcert.c:3338 src/getcert.c:3386 src/getcert.c:3453
 msgid "  -p FILE\tfile which holds the encryption PIN\n"
 msgstr ""
 
-#: src/getcert.c:3340 src/getcert.c:3388 src/getcert.c:3455
+#: src/getcert.c:3339 src/getcert.c:3387 src/getcert.c:3454
 msgid "  -P PIN\tPIN value\n"
 msgstr ""
 
-#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3432 src/getcert.c:3466
-#: src/getcert.c:3488 src/getcert.c:3525 src/getcert.c:3535 src/getcert.c:3553
-#: src/getcert.c:3568
+#: src/getcert.c:3341 src/getcert.c:3389 src/getcert.c:3431 src/getcert.c:3465
+#: src/getcert.c:3487 src/getcert.c:3524 src/getcert.c:3534 src/getcert.c:3552
+#: src/getcert.c:3567
 msgid "Optional arguments:\n"
 msgstr ""
 
-#: src/getcert.c:3343 src/getcert.c:3391 src/getcert.c:3467
+#: src/getcert.c:3342 src/getcert.c:3390 src/getcert.c:3466
 msgid "* Certificate handling settings:\n"
 msgstr ""
 
-#: src/getcert.c:3344
+#: src/getcert.c:3343
 msgid "  -I NAME\tnickname to assign to the request\n"
 msgstr ""
 
-#: src/getcert.c:3345
+#: src/getcert.c:3344
 msgid "  -G TYPE\ttype of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3346
+#: src/getcert.c:3345
 msgid "  -g SIZE\tsize of key to be generated if one is not already in place\n"
 msgstr ""
 
-#: src/getcert.c:3347 src/getcert.c:3393
-msgid "  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
+#: src/getcert.c:3346 src/getcert.c:3392
+msgid ""
+"  -r\t\tattempt to renew the certificate when expiration nears (default)\n"
 msgstr ""
 
-#: src/getcert.c:3348 src/getcert.c:3394
+#: src/getcert.c:3347 src/getcert.c:3393
 msgid "  -R\t\tdon't attempt to renew the certificate when expiration nears\n"
 msgstr ""
 
-#: src/getcert.c:3350 src/getcert.c:3396
+#: src/getcert.c:3349 src/getcert.c:3395
 msgid "  -c CA\t\tuse the specified CA rather than the default\n"
 msgstr ""
 
-#: src/getcert.c:3352 src/getcert.c:3398 src/getcert.c:3472
+#: src/getcert.c:3351 src/getcert.c:3397 src/getcert.c:3471
 msgid ""
 "  -T PROFILE\task the CA to process the request using the named profile or "
 "template\n"
 msgstr ""
 
-#: src/getcert.c:3353
+#: src/getcert.c:3352
 msgid "* Parameters for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3354 src/getcert.c:3458
+#: src/getcert.c:3353 src/getcert.c:3457
 msgid "  -N NAME\tset requested subject name (default: CN=<hostname>)\n"
 msgstr ""
 
-#: src/getcert.c:3355 src/getcert.c:3459
+#: src/getcert.c:3354 src/getcert.c:3458
 msgid "  -U EXTUSAGE\tset requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3356 src/getcert.c:3401 src/getcert.c:3460
+#: src/getcert.c:3355 src/getcert.c:3400 src/getcert.c:3459
 msgid "  -u KEYUSAGE\tset requested key usage value\n"
 msgstr ""
 
-#: src/getcert.c:3357 src/getcert.c:3461
+#: src/getcert.c:3356 src/getcert.c:3460
 msgid "  -K NAME\tset requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3358 src/getcert.c:3462
+#: src/getcert.c:3357 src/getcert.c:3461
 msgid "  -D DNSNAME\tset requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3359 src/getcert.c:3463
+#: src/getcert.c:3358 src/getcert.c:3462
 msgid "  -E EMAIL\tset requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3360 src/getcert.c:3464
+#: src/getcert.c:3359 src/getcert.c:3463
 msgid "  -A ADDRESS\tset requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
-#: src/getcert.c:3502 src/getcert.c:3526 src/getcert.c:3543 src/getcert.c:3558
-#: src/getcert.c:3574
+#: src/getcert.c:3360 src/getcert.c:3405 src/getcert.c:3432 src/getcert.c:3472
+#: src/getcert.c:3501 src/getcert.c:3525 src/getcert.c:3542 src/getcert.c:3557
+#: src/getcert.c:3573
 msgid "* Bus options:\n"
 msgstr ""
 
-#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
-#: src/getcert.c:3527
+#: src/getcert.c:3361 src/getcert.c:3406 src/getcert.c:3433 src/getcert.c:3473
+#: src/getcert.c:3526
 msgid "  -S\t\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
-#: src/getcert.c:3528
+#: src/getcert.c:3362 src/getcert.c:3407 src/getcert.c:3434 src/getcert.c:3474
+#: src/getcert.c:3527
 msgid "  -s\t\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3436 src/getcert.c:3476
-#: src/getcert.c:3505 src/getcert.c:3546 src/getcert.c:3561 src/getcert.c:3577
+#: src/getcert.c:3363 src/getcert.c:3408 src/getcert.c:3435 src/getcert.c:3475
+#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
 msgid "* Other options:\n"
 msgstr ""
 
-#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
+#: src/getcert.c:3364 src/getcert.c:3409 src/getcert.c:3476
 msgid "  -B\tcommand to run before saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
+#: src/getcert.c:3365 src/getcert.c:3410 src/getcert.c:3477
 msgid "  -C\tcommand to run after saving the certificate\n"
 msgstr ""
 
-#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
+#: src/getcert.c:3366 src/getcert.c:3411 src/getcert.c:3478
 msgid "  -F\tfile in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
+#: src/getcert.c:3367 src/getcert.c:3412 src/getcert.c:3479
 msgid "  -a\tNSS database in which to store the CA's certificates\n"
 msgstr ""
 
-#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3481
+#: src/getcert.c:3368 src/getcert.c:3413 src/getcert.c:3480
 msgid "  -w\ttry to wait for the certificate to be issued\n"
 msgstr ""
 
-#: src/getcert.c:3370 src/getcert.c:3415 src/getcert.c:3437 src/getcert.c:3482
-#: src/getcert.c:3506 src/getcert.c:3529 src/getcert.c:3547 src/getcert.c:3562
-#: src/getcert.c:3578
+#: src/getcert.c:3369 src/getcert.c:3414 src/getcert.c:3436 src/getcert.c:3481
+#: src/getcert.c:3505 src/getcert.c:3528 src/getcert.c:3546 src/getcert.c:3561
+#: src/getcert.c:3577
 msgid "  -v\treport all details of errors\n"
 msgstr ""
 
-#: src/getcert.c:3374
+#: src/getcert.c:3373
 #, c-format
 msgid "Usage: %s start-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3377
+#: src/getcert.c:3376
 msgid "* If modifying an existing request:\n"
 msgstr ""
 
-#: src/getcert.c:3378
+#: src/getcert.c:3377
 msgid "  -i NAME\tnickname of an existing tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3386 src/getcert.c:3453
+#: src/getcert.c:3385 src/getcert.c:3452
 msgid "* If keys are encrypted:\n"
 msgstr ""
 
-#: src/getcert.c:3392
+#: src/getcert.c:3391
 msgid "  -I NAME\tnickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3399
+#: src/getcert.c:3398
 msgid "* Parameters for the signing request at renewal time:\n"
 msgstr ""
 
-#: src/getcert.c:3400
+#: src/getcert.c:3399
 msgid "  -U EXTUSAGE\toverride requested extended key usage OID\n"
 msgstr ""
 
-#: src/getcert.c:3402
+#: src/getcert.c:3401
 msgid "  -K NAME\toverride requested principal name\n"
 msgstr ""
 
-#: src/getcert.c:3403
+#: src/getcert.c:3402
 msgid "  -D DNSNAME\toverride requested DNS name\n"
 msgstr ""
 
-#: src/getcert.c:3404
+#: src/getcert.c:3403
 msgid "  -E EMAIL\toverride requested email address\n"
 msgstr ""
 
-#: src/getcert.c:3405
+#: src/getcert.c:3404
 msgid "  -A ADDRESS\toverride requested IP address\n"
 msgstr ""
 
-#: src/getcert.c:3419
+#: src/getcert.c:3418
 #, c-format
 msgid "Usage: %s stop-tracking [options]\n"
 msgstr ""
 
-#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3516
+#: src/getcert.c:3421 src/getcert.c:3443 src/getcert.c:3515
 msgid "* By request identifier:\n"
 msgstr ""
 
-#: src/getcert.c:3423 src/getcert.c:3445 src/getcert.c:3496 src/getcert.c:3517
-#: src/getcert.c:3537
+#: src/getcert.c:3422 src/getcert.c:3444 src/getcert.c:3495 src/getcert.c:3516
+#: src/getcert.c:3536
 msgid "  -i NAME\tnickname for tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3441
+#: src/getcert.c:3440
 #, c-format
 msgid "Usage: %s resubmit [options]\n"
 msgstr ""
 
-#: src/getcert.c:3451 src/getcert.c:3523
+#: src/getcert.c:3450 src/getcert.c:3522
 msgid "  -f FILE\tPEM file for certificate\n"
 msgstr ""
 
-#: src/getcert.c:3457
+#: src/getcert.c:3456
 msgid "* New parameter values for the signing request:\n"
 msgstr ""
 
-#: src/getcert.c:3468
+#: src/getcert.c:3467
 msgid "  -I NAME\tnew nickname to give to tracking request\n"
 msgstr ""
 
-#: src/getcert.c:3470
+#: src/getcert.c:3469
 msgid "  -c CA\t\tuse the specified CA rather than the current one\n"
 msgstr ""
 
-#: src/getcert.c:3486
+#: src/getcert.c:3485
 #, c-format
 msgid "Usage: %s list [options]\n"
 msgstr ""
 
-#: src/getcert.c:3489 src/getcert.c:3512 src/getcert.c:3555 src/getcert.c:3570
+#: src/getcert.c:3488 src/getcert.c:3511 src/getcert.c:3554 src/getcert.c:3569
 msgid "* General options:\n"
 msgstr ""
 
-#: src/getcert.c:3491
+#: src/getcert.c:3490
 msgid "  -c CA\tlist only requests and certs associated with this CA\n"
 msgstr ""
 
-#: src/getcert.c:3493
+#: src/getcert.c:3492
 msgid "  -r\tlist only information about outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3494
+#: src/getcert.c:3493
 msgid "  -t\tlist only information about tracked certificates\n"
 msgstr ""
 
-#: src/getcert.c:3495
+#: src/getcert.c:3494
 msgid "* If selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3498
+#: src/getcert.c:3497
 msgid "  -d DIR\tonly list requests and certs which use this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3499
+#: src/getcert.c:3498
 msgid "  -n NAME\tonly list requests and certs which use this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3501
+#: src/getcert.c:3500
 msgid "  -f FILE\tonly list requests and certs stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
+#: src/getcert.c:3502 src/getcert.c:3543 src/getcert.c:3558 src/getcert.c:3574
 msgid "  -S\tconnect to the certmonger service on the system bus\n"
 msgstr ""
 
-#: src/getcert.c:3504 src/getcert.c:3545 src/getcert.c:3560 src/getcert.c:3576
+#: src/getcert.c:3503 src/getcert.c:3544 src/getcert.c:3559 src/getcert.c:3575
 msgid "  -s\tconnect to the certmonger service on the session bus\n"
 msgstr ""
 
-#: src/getcert.c:3510
+#: src/getcert.c:3509
 #, c-format
 msgid "Usage: %s refresh [options]\n"
 msgstr ""
 
-#: src/getcert.c:3513
+#: src/getcert.c:3512
 msgid "  -a   \trefresh information about all outstanding requests\n"
 msgstr ""
 
-#: src/getcert.c:3533
+#: src/getcert.c:3532
 #, c-format
 msgid "Usage: %s status [options]\n"
 msgstr ""
 
-#: src/getcert.c:3536
+#: src/getcert.c:3535
 msgid "* Selecting a specific request:\n"
 msgstr ""
 
-#: src/getcert.c:3538
+#: src/getcert.c:3537
 msgid "* When using an NSS database for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3539
+#: src/getcert.c:3538
 msgid "  -d DIR\treturn status for the request in this NSS database\n"
 msgstr ""
 
-#: src/getcert.c:3540
+#: src/getcert.c:3539
 msgid "  -n NAME\treturn status for cert which uses this nickname\n"
 msgstr ""
 
-#: src/getcert.c:3541
+#: src/getcert.c:3540
 msgid "* When using files for storage:\n"
 msgstr ""
 
-#: src/getcert.c:3542
+#: src/getcert.c:3541
 msgid "  -f FILE\treturn status for cert stored in this PEM file\n"
 msgstr ""
 
-#: src/getcert.c:3551
+#: src/getcert.c:3550
 #, c-format
 msgid "Usage: %s list-cas [options]\n"
 msgstr ""
 
-#: src/getcert.c:3556
+#: src/getcert.c:3555
 msgid "  -c CA\tlist only information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3566
+#: src/getcert.c:3565
 #, c-format
 msgid "Usage: %s refresh-ca [options]\n"
 msgstr ""
 
-#: src/getcert.c:3571
+#: src/getcert.c:3570
 msgid "  -c CA\trefresh information about the CA with this name\n"
 msgstr ""
 
-#: src/getcert.c:3572
+#: src/getcert.c:3571
 msgid "  -a   \trefresh information about all known CAs\n"
 msgstr ""
 
-#: src/getcert.c:3632
+#: src/getcert.c:3631
 #, c-format
 msgid "%s: unrecognized command\n"
 msgstr ""
@@ -983,13 +986,14 @@ msgstr ""
 #: src/ipa.c:306
 #, c-format
 msgid ""
-"Error setting up ccache for \"host\" service on client using default keytab:"
-" %s.\n"
+"Error setting up ccache for \"host\" service on client using default keytab: "
+"%s.\n"
 msgstr ""
 
 #: src/ipa.c:310
 #, c-format
-msgid "Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
+msgid ""
+"Error setting up ccache for \"%s\" on client using default keytab: %s.\n"
 msgstr ""
 
 #: src/ipa.c:317
@@ -1060,7 +1064,7 @@ msgstr ""
 msgid "\t-F         force NSS into FIPS mode\n"
 msgstr ""
 
-#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2161
+#: src/tdbush.c:119 src/tdbush.c:1859 src/tdbush.c:2200
 msgid "An internal error has occurred."
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 
 #: src/tdbush.c:486 src/tdbush.c:519 src/tdbush.c:578 src/tdbush.c:763
 #: src/tdbush.c:822 src/tdbush.c:925 src/tdbush.c:970 src/tdbush.c:1025
-#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:2974
+#: src/tdbush.c:1070 src/tdbush.c:1125 src/tdbush.c:1170 src/tdbush.c:3013
 #, c-format
 msgid "The location \"%s\" must be an absolute path."
 msgstr ""
@@ -1115,7 +1119,8 @@ msgstr ""
 
 #: src/tdbush.c:590 src/tdbush.c:937 src/tdbush.c:1037 src/tdbush.c:1137
 #, c-format
-msgid "The location \"%s\" could not be accessed due to insufficient permissions."
+msgid ""
+"The location \"%s\" could not be accessed due to insufficient permissions."
 msgstr ""
 
 #: src/tdbush.c:598 src/tdbush.c:831 src/tdbush.c:945 src/tdbush.c:1045
@@ -1128,7 +1133,7 @@ msgstr ""
 msgid "Certificate nickname not specified."
 msgstr ""
 
-#: src/tdbush.c:662 src/tdbush.c:2865
+#: src/tdbush.c:662 src/tdbush.c:2904
 #, c-format
 msgid "There is already a request with the nickname \"%s\"."
 msgstr ""
@@ -1136,8 +1141,7 @@ msgstr ""
 #: src/tdbush.c:698
 #, c-format
 msgid ""
-"Certificate at same location is already used by request with nickname "
-"\"%s\"."
+"Certificate at same location is already used by request with nickname \"%s\"."
 msgstr ""
 
 #: src/tdbush.c:731
@@ -1167,20 +1171,20 @@ msgstr ""
 msgid "No such CA."
 msgstr ""
 
-#: src/tdbush.c:2883
+#: src/tdbush.c:2922
 #, c-format
 msgid "Certificate authority \"%s\" not known."
 msgstr ""
 
-#: src/tdbush.c:3219
+#: src/tdbush.c:3258
 msgid "Unrecognized parameter or wrong value type."
 msgstr ""
 
-#: src/tdbush.c:4550
+#: src/tdbush.c:4589
 msgid "Error parsing arguments."
 msgstr ""
 
-#: src/tdbush.c:4604
+#: src/tdbush.c:4643
 msgid "Unrecognized property name."
 msgstr ""