--- embedaddon/sudo/plugins/sudoers/po/sudoers.pot	2013/07/22 10:46:12	1.1.1.4
+++ embedaddon/sudo/plugins/sudoers/po/sudoers.pot	2013/10/14 07:56:35	1.1.1.5
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sudo 1.8.7\n"
+"Project-Id-Version: sudo 1.8.8\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2013-04-29 14:01-0400\n"
+"POT-Creation-Date: 2013-09-03 14:48-0600\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"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Sorry, try again."
 msgstr ""
 
-#: plugins/sudoers/alias.c:124
+#: plugins/sudoers/alias.c:136
 #, c-format
 msgid "Alias `%s' already defined"
 msgstr ""
@@ -48,7 +48,7 @@ msgid "invalid authentication type"
 msgstr ""
 
 #: plugins/sudoers/auth/bsdauth.c:100
-msgid "unable to setup authentication"
+msgid "unable to initialize BSD authentication"
 msgstr ""
 
 #: plugins/sudoers/auth/fwtk.c:59
@@ -119,45 +119,40 @@ msgstr ""
 msgid "%s: Cannot verify TGT! Possible attack!: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:105
+#: plugins/sudoers/auth/pam.c:98
 msgid "unable to initialize PAM"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:150
+#: plugins/sudoers/auth/pam.c:149
 msgid "account validation failure, is your account locked?"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:154
+#: plugins/sudoers/auth/pam.c:153
 msgid "Account or password is expired, reset your password and try again"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:162
+#: plugins/sudoers/auth/pam.c:161
 #, c-format
 msgid "unable to change expired password: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:167
+#: plugins/sudoers/auth/pam.c:166
 msgid "Password expired, contact your system administrator"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:171
+#: plugins/sudoers/auth/pam.c:170
 msgid ""
 "Account expired or PAM config lacks an \"account\" section for sudo, contact "
 "your system administrator"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:188
+#: plugins/sudoers/auth/pam.c:187
 #, c-format
 msgid "PAM authentication error: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:247
+#: plugins/sudoers/auth/rfc1938.c:103 plugins/sudoers/visudo.c:226
 #, c-format
-msgid "unable to establish credentials: %s"
-msgstr ""
-
-#: plugins/sudoers/auth/rfc1938.c:103 plugins/sudoers/visudo.c:212
-#, c-format
 msgid "you do not exist in the %s database"
 msgstr ""
 
@@ -229,12 +224,12 @@ msgstr ""
 msgid "Authentication methods:"
 msgstr ""
 
-#: plugins/sudoers/bsm_audit.c:90 plugins/sudoers/bsm_audit.c:153
+#: plugins/sudoers/bsm_audit.c:91 plugins/sudoers/bsm_audit.c:158
 #, c-format
 msgid "Could not determine audit condition"
 msgstr ""
 
-#: plugins/sudoers/bsm_audit.c:129 plugins/sudoers/bsm_audit.c:190
+#: plugins/sudoers/bsm_audit.c:134 plugins/sudoers/bsm_audit.c:199
 #, c-format
 msgid "unable to commit audit record"
 msgstr ""
@@ -252,14 +247,14 @@ msgid ""
 msgstr ""
 
 #: plugins/sudoers/check.c:227 plugins/sudoers/check.c:233
-#: plugins/sudoers/sudoers.c:562 plugins/sudoers/sudoers.c:566
+#: plugins/sudoers/sudoers.c:562 plugins/sudoers/sudoers.c:588
 #, c-format
 msgid "unknown uid: %u"
 msgstr ""
 
-#: plugins/sudoers/check.c:230 plugins/sudoers/policy.c:645
-#: plugins/sudoers/sudoers.c:845 plugins/sudoers/testsudoers.c:215
-#: plugins/sudoers/testsudoers.c:359
+#: plugins/sudoers/check.c:230 plugins/sudoers/policy.c:682
+#: plugins/sudoers/sudoers.c:847 plugins/sudoers/testsudoers.c:215
+#: plugins/sudoers/testsudoers.c:361
 #, c-format
 msgid "unknown user: %s"
 msgstr ""
@@ -633,14 +628,26 @@ msgid "Run commands on a pty in the background"
 msgstr ""
 
 #: plugins/sudoers/def_data.c:359
-msgid "Create a new PAM session for the command to run in"
+msgid "PAM service name to use"
 msgstr ""
 
 #: plugins/sudoers/def_data.c:363
+msgid "PAM service name to use for login shells"
+msgstr ""
+
+#: plugins/sudoers/def_data.c:367
+msgid "Attempt to establish PAM credentials for the target user"
+msgstr ""
+
+#: plugins/sudoers/def_data.c:371
+msgid "Create a new PAM session for the command to run in"
+msgstr ""
+
+#: plugins/sudoers/def_data.c:375
 msgid "Maximum I/O log sequence number"
 msgstr ""
 
-#: plugins/sudoers/defaults.c:207 plugins/sudoers/defaults.c:587
+#: plugins/sudoers/defaults.c:207 plugins/sudoers/defaults.c:593
 #, c-format
 msgid "unknown defaults entry `%s'"
 msgstr ""
@@ -675,9 +682,9 @@ msgstr ""
 
 #: plugins/sudoers/env.c:288 plugins/sudoers/env.c:293
 #: plugins/sudoers/env.c:395 plugins/sudoers/linux_audit.c:82
-#: plugins/sudoers/policy.c:430 plugins/sudoers/policy.c:437
-#: plugins/sudoers/prompt.c:171 plugins/sudoers/sudoers.c:654
-#: plugins/sudoers/testsudoers.c:243
+#: plugins/sudoers/policy.c:467 plugins/sudoers/policy.c:474
+#: plugins/sudoers/prompt.c:171 plugins/sudoers/sudoers.c:656
+#: plugins/sudoers/testsudoers.c:245
 #, c-format
 msgid "internal error, %s overflow"
 msgstr ""
@@ -687,7 +694,7 @@ msgstr ""
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr ""
 
-#: plugins/sudoers/env.c:1012
+#: plugins/sudoers/env.c:1014
 #, c-format
 msgid ""
 "sorry, you are not allowed to set the following environment variables: %s"
@@ -722,83 +729,83 @@ msgstr ""
 msgid "Local IP address and netmask pairs:\n"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:131 plugins/sudoers/iolog.c:144
+#: plugins/sudoers/iolog.c:99 plugins/sudoers/iolog.c:112
 #: plugins/sudoers/timestamp.c:200 plugins/sudoers/timestamp.c:244
 #, c-format
 msgid "%s exists but is not a directory (0%o)"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:141 plugins/sudoers/iolog.c:155
-#: plugins/sudoers/iolog.c:159 plugins/sudoers/timestamp.c:165
+#: plugins/sudoers/iolog.c:109 plugins/sudoers/iolog.c:123
+#: plugins/sudoers/iolog.c:127 plugins/sudoers/timestamp.c:165
 #: plugins/sudoers/timestamp.c:221 plugins/sudoers/timestamp.c:271
 #, c-format
 msgid "unable to mkdir %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:217 plugins/sudoers/sudoers.c:708
-#: plugins/sudoers/sudoreplay.c:354 plugins/sudoers/sudoreplay.c:815
-#: plugins/sudoers/sudoreplay.c:978 plugins/sudoers/timestamp.c:155
-#: plugins/sudoers/visudo.c:810
+#: plugins/sudoers/iolog.c:185 plugins/sudoers/sudoers.c:710
+#: plugins/sudoers/sudoreplay.c:346 plugins/sudoers/sudoreplay.c:808
+#: plugins/sudoers/sudoreplay.c:971 plugins/sudoers/timestamp.c:155
+#: plugins/sudoers/visudo.c:824
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:250 plugins/sudoers/sudoers.c:711
+#: plugins/sudoers/iolog.c:218 plugins/sudoers/sudoers.c:713
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:274 plugins/sudoers/timestamp.c:159
+#: plugins/sudoers/iolog.c:242 plugins/sudoers/timestamp.c:159
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:334
+#: plugins/sudoers/iolog.c:302 plugins/sudoers/iolog.c:491
 #, c-format
 msgid "unable to create %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:407
+#: plugins/sudoers/ldap.c:403
 #, c-format
 msgid "sudo_ldap_conf_add_ports: port too large"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:430
+#: plugins/sudoers/ldap.c:426
 #, c-format
 msgid "sudo_ldap_conf_add_ports: out of space expanding hostbuf"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:460
+#: plugins/sudoers/ldap.c:456
 #, c-format
 msgid "unsupported LDAP uri type: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:489
+#: plugins/sudoers/ldap.c:485
 #, c-format
 msgid "invalid uri: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:495
+#: plugins/sudoers/ldap.c:491
 #, c-format
 msgid "unable to mix ldap and ldaps URIs"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:499
+#: plugins/sudoers/ldap.c:495
 #, c-format
 msgid "unable to mix ldaps and starttls"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:518
+#: plugins/sudoers/ldap.c:514
 #, c-format
 msgid "sudo_ldap_parse_uri: out of space building hostbuf"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:592
+#: plugins/sudoers/ldap.c:588
 #, c-format
 msgid "unable to initialize SSL cert and key db: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:595
+#: plugins/sudoers/ldap.c:591
 #, c-format
 msgid "you must set TLS_CERT in %s to use SSL"
 msgstr ""
@@ -823,44 +830,44 @@ msgstr ""
 msgid "sudo_ldap_build_pass1 allocation mismatch"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1845
+#: plugins/sudoers/ldap.c:1887
 #, c-format
 msgid ""
 "\n"
 "LDAP Role: %s\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1847
+#: plugins/sudoers/ldap.c:1889
 #, c-format
 msgid ""
 "\n"
 "LDAP Role: UNKNOWN\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1894
+#: plugins/sudoers/ldap.c:1936
 #, c-format
 msgid "    Order: %s\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1902 plugins/sudoers/parse.c:515
+#: plugins/sudoers/ldap.c:1944 plugins/sudoers/parse.c:515
 #: plugins/sudoers/sssd.c:1242
 #, c-format
 msgid "    Commands:\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:2325
+#: plugins/sudoers/ldap.c:2481
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:2359
+#: plugins/sudoers/ldap.c:2519
 #, c-format
 msgid ""
 "start_tls specified but LDAP libs do not support ldap_start_tls_s() or "
 "ldap_start_tls_s_np()"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:2595
+#: plugins/sudoers/ldap.c:2755
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr ""
@@ -895,117 +902,117 @@ msgstr ""
 msgid "unable to lock log file: %s: %s"
 msgstr ""
 
-#: plugins/sudoers/logging.c:245
+#: plugins/sudoers/logging.c:249
 msgid "No user or host"
 msgstr ""
 
-#: plugins/sudoers/logging.c:247
+#: plugins/sudoers/logging.c:251
 msgid "validation failure"
 msgstr ""
 
-#: plugins/sudoers/logging.c:254
+#: plugins/sudoers/logging.c:258
 msgid "user NOT in sudoers"
 msgstr ""
 
-#: plugins/sudoers/logging.c:256
+#: plugins/sudoers/logging.c:260
 msgid "user NOT authorized on host"
 msgstr ""
 
-#: plugins/sudoers/logging.c:258
+#: plugins/sudoers/logging.c:262
 msgid "command not allowed"
 msgstr ""
 
-#: plugins/sudoers/logging.c:288
+#: plugins/sudoers/logging.c:292
 #, c-format
 msgid "%s is not in the sudoers file.  This incident will be reported.\n"
 msgstr ""
 
-#: plugins/sudoers/logging.c:291
+#: plugins/sudoers/logging.c:295
 #, c-format
 msgid "%s is not allowed to run sudo on %s.  This incident will be reported.\n"
 msgstr ""
 
-#: plugins/sudoers/logging.c:295
+#: plugins/sudoers/logging.c:299
 #, c-format
 msgid "Sorry, user %s may not run sudo on %s.\n"
 msgstr ""
 
-#: plugins/sudoers/logging.c:298
+#: plugins/sudoers/logging.c:302
 #, c-format
 msgid "Sorry, user %s is not allowed to execute '%s%s%s' as %s%s%s on %s.\n"
 msgstr ""
 
-#: plugins/sudoers/logging.c:335 plugins/sudoers/sudoers.c:383
-#: plugins/sudoers/sudoers.c:384 plugins/sudoers/sudoers.c:386
-#: plugins/sudoers/sudoers.c:387 plugins/sudoers/sudoers.c:1001
-#: plugins/sudoers/sudoers.c:1002
+#: plugins/sudoers/logging.c:339 plugins/sudoers/sudoers.c:382
+#: plugins/sudoers/sudoers.c:383 plugins/sudoers/sudoers.c:385
+#: plugins/sudoers/sudoers.c:386 plugins/sudoers/sudoers.c:1003
+#: plugins/sudoers/sudoers.c:1004
 #, c-format
 msgid "%s: command not found"
 msgstr ""
 
-#: plugins/sudoers/logging.c:337 plugins/sudoers/sudoers.c:379
+#: plugins/sudoers/logging.c:341 plugins/sudoers/sudoers.c:378
 #, c-format
 msgid ""
 "ignoring `%s' found in '.'\n"
 "Use `sudo ./%s' if this is the `%s' you wish to run."
 msgstr ""
 
-#: plugins/sudoers/logging.c:353
+#: plugins/sudoers/logging.c:357
 msgid "authentication failure"
 msgstr ""
 
-#: plugins/sudoers/logging.c:379
+#: plugins/sudoers/logging.c:383
 msgid "a password is required"
 msgstr ""
 
-#: plugins/sudoers/logging.c:443 plugins/sudoers/logging.c:487
+#: plugins/sudoers/logging.c:447 plugins/sudoers/logging.c:491
 #, c-format
 msgid "%d incorrect password attempt"
 msgid_plural "%d incorrect password attempts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/sudoers/logging.c:566
+#: plugins/sudoers/logging.c:575
 #, c-format
 msgid "unable to fork"
 msgstr ""
 
-#: plugins/sudoers/logging.c:573 plugins/sudoers/logging.c:629
+#: plugins/sudoers/logging.c:582 plugins/sudoers/logging.c:638
 #, c-format
 msgid "unable to fork: %m"
 msgstr ""
 
-#: plugins/sudoers/logging.c:619
+#: plugins/sudoers/logging.c:628
 #, c-format
 msgid "unable to open pipe: %m"
 msgstr ""
 
-#: plugins/sudoers/logging.c:644
+#: plugins/sudoers/logging.c:653
 #, c-format
 msgid "unable to dup stdin: %m"
 msgstr ""
 
-#: plugins/sudoers/logging.c:680
+#: plugins/sudoers/logging.c:688
 #, c-format
 msgid "unable to execute %s: %m"
 msgstr ""
 
-#: plugins/sudoers/logging.c:899
+#: plugins/sudoers/logging.c:907
 #, c-format
 msgid "internal error: insufficient space for log line"
 msgstr ""
 
-#: plugins/sudoers/match.c:631
+#: plugins/sudoers/match.c:604
 #, c-format
 msgid "unsupported digest type %d for %s"
 msgstr ""
 
-#: plugins/sudoers/match.c:661
+#: plugins/sudoers/match.c:634
 #, c-format
 msgid "%s: read error"
 msgstr ""
 
-#: plugins/sudoers/match.c:670
+#: plugins/sudoers/match.c:643
 #, c-format
 msgid "digest for %s (%s) is not in %s form"
 msgstr ""
@@ -1042,39 +1049,63 @@ msgstr ""
 msgid "    Options: "
 msgstr ""
 
-#: plugins/sudoers/policy.c:527 plugins/sudoers/visudo.c:751
+#: plugins/sudoers/policy.c:111 plugins/sudoers/policy.c:118
+#: plugins/sudoers/policy.c:126 plugins/sudoers/policy.c:129
+#: plugins/sudoers/policy.c:152 plugins/sudoers/policy.c:155
+#: plugins/sudoers/policy.c:272 plugins/sudoers/policy.c:275
+#: plugins/sudoers/policy.c:294 plugins/sudoers/policy.c:301
+#: plugins/sudoers/policy.c:329 plugins/sudoers/policy.c:332
+#: plugins/sudoers/policy.c:341 plugins/sudoers/policy.c:344
+#: plugins/sudoers/policy.c:352
 #, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: plugins/sudoers/policy.c:126 plugins/sudoers/policy.c:152
+#: plugins/sudoers/policy.c:272 plugins/sudoers/policy.c:329
+#: plugins/sudoers/policy.c:341
+msgid "invalid value"
+msgstr ""
+
+#: plugins/sudoers/policy.c:129 plugins/sudoers/policy.c:155
+#: plugins/sudoers/policy.c:275 plugins/sudoers/policy.c:332
+#: plugins/sudoers/policy.c:344
+msgid "value out of range"
+msgstr ""
+
+#: plugins/sudoers/policy.c:564 plugins/sudoers/visudo.c:765
+#, c-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: plugins/sudoers/policy.c:669
+#: plugins/sudoers/policy.c:706
 #, c-format
 msgid "Sudoers policy plugin version %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:671
+#: plugins/sudoers/policy.c:708
 #, c-format
 msgid "Sudoers file grammar version %d\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:675
+#: plugins/sudoers/policy.c:712
 #, c-format
 msgid ""
 "\n"
 "Sudoers path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:678
+#: plugins/sudoers/policy.c:715
 #, c-format
 msgid "nsswitch path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:680
+#: plugins/sudoers/policy.c:717
 #, c-format
 msgid "ldap.conf path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:681
+#: plugins/sudoers/policy.c:718
 #, c-format
 msgid "ldap.secret path: %s\n"
 msgstr ""
@@ -1109,45 +1140,45 @@ msgstr ""
 msgid "unable to parse groups for %s"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:122 plugins/sudoers/set_perms.c:445
-#: plugins/sudoers/set_perms.c:846 plugins/sudoers/set_perms.c:1141
-#: plugins/sudoers/set_perms.c:1431
+#: plugins/sudoers/set_perms.c:124 plugins/sudoers/set_perms.c:447
+#: plugins/sudoers/set_perms.c:848 plugins/sudoers/set_perms.c:1143
+#: plugins/sudoers/set_perms.c:1433
 msgid "perm stack overflow"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:130 plugins/sudoers/set_perms.c:453
-#: plugins/sudoers/set_perms.c:854 plugins/sudoers/set_perms.c:1149
-#: plugins/sudoers/set_perms.c:1439
+#: plugins/sudoers/set_perms.c:132 plugins/sudoers/set_perms.c:455
+#: plugins/sudoers/set_perms.c:856 plugins/sudoers/set_perms.c:1151
+#: plugins/sudoers/set_perms.c:1441
 msgid "perm stack underflow"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:189 plugins/sudoers/set_perms.c:500
-#: plugins/sudoers/set_perms.c:1200 plugins/sudoers/set_perms.c:1471
+#: plugins/sudoers/set_perms.c:191 plugins/sudoers/set_perms.c:502
+#: plugins/sudoers/set_perms.c:1202 plugins/sudoers/set_perms.c:1473
 msgid "unable to change to root gid"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:278 plugins/sudoers/set_perms.c:597
-#: plugins/sudoers/set_perms.c:983 plugins/sudoers/set_perms.c:1277
+#: plugins/sudoers/set_perms.c:280 plugins/sudoers/set_perms.c:599
+#: plugins/sudoers/set_perms.c:985 plugins/sudoers/set_perms.c:1279
 msgid "unable to change to runas gid"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:290 plugins/sudoers/set_perms.c:609
-#: plugins/sudoers/set_perms.c:993 plugins/sudoers/set_perms.c:1287
+#: plugins/sudoers/set_perms.c:292 plugins/sudoers/set_perms.c:611
+#: plugins/sudoers/set_perms.c:995 plugins/sudoers/set_perms.c:1289
 msgid "unable to change to runas uid"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:308 plugins/sudoers/set_perms.c:627
-#: plugins/sudoers/set_perms.c:1009 plugins/sudoers/set_perms.c:1303
+#: plugins/sudoers/set_perms.c:310 plugins/sudoers/set_perms.c:629
+#: plugins/sudoers/set_perms.c:1011 plugins/sudoers/set_perms.c:1305
 msgid "unable to change to sudoers gid"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:361 plugins/sudoers/set_perms.c:698
-#: plugins/sudoers/set_perms.c:1055 plugins/sudoers/set_perms.c:1349
-#: plugins/sudoers/set_perms.c:1515
+#: plugins/sudoers/set_perms.c:363 plugins/sudoers/set_perms.c:700
+#: plugins/sudoers/set_perms.c:1057 plugins/sudoers/set_perms.c:1351
+#: plugins/sudoers/set_perms.c:1517
 msgid "too many processes"
 msgstr ""
 
-#: plugins/sudoers/set_perms.c:1583
+#: plugins/sudoers/set_perms.c:1585
 msgid "unable to set runas group vector"
 msgstr ""
 
@@ -1165,7 +1196,7 @@ msgstr ""
 
 #: plugins/sudoers/sudo_nss.c:283
 #, c-format
-msgid "Matching Defaults entries for %s on this host:\n"
+msgid "Matching Defaults entries for %s on %s:\n"
 msgstr ""
 
 #: plugins/sudoers/sudo_nss.c:296
@@ -1175,7 +1206,7 @@ msgstr ""
 
 #: plugins/sudoers/sudo_nss.c:309
 #, c-format
-msgid "User %s may run the following commands on this host:\n"
+msgid "User %s may run the following commands on %s:\n"
 msgstr ""
 
 #: plugins/sudoers/sudo_nss.c:318
@@ -1183,265 +1214,265 @@ msgstr ""
 msgid "User %s is not allowed to run sudo on %s.\n"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:159 plugins/sudoers/sudoers.c:193
-#: plugins/sudoers/sudoers.c:673
+#: plugins/sudoers/sudoers.c:158 plugins/sudoers/sudoers.c:192
+#: plugins/sudoers/sudoers.c:675
 msgid "problem with defaults entries"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:165
+#: plugins/sudoers/sudoers.c:164
 #, c-format
 msgid "no valid sudoers sources found, quitting"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:227
+#: plugins/sudoers/sudoers.c:226
 #, c-format
 msgid "sudoers specifies that root is not allowed to sudo"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:234
+#: plugins/sudoers/sudoers.c:265
 #, c-format
 msgid "you are not permitted to use the -C option"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:315
+#: plugins/sudoers/sudoers.c:314
 #, c-format
 msgid "timestamp owner (%s): No such user"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:329
+#: plugins/sudoers/sudoers.c:328
 msgid "no tty"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:330
+#: plugins/sudoers/sudoers.c:329
 #, c-format
 msgid "sorry, you must have a tty to run sudo"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:378
+#: plugins/sudoers/sudoers.c:377
 msgid "command in current directory"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:395
+#: plugins/sudoers/sudoers.c:394
 #, c-format
 msgid "sorry, you are not allowed to preserve the environment"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:723 plugins/sudoers/timestamp.c:216
-#: plugins/sudoers/timestamp.c:260 plugins/sudoers/timestamp.c:328
-#: plugins/sudoers/visudo.c:312 plugins/sudoers/visudo.c:577
+#: plugins/sudoers/sudoers.c:725 plugins/sudoers/timestamp.c:216
+#: plugins/sudoers/timestamp.c:260 plugins/sudoers/timestamp.c:326
+#: plugins/sudoers/visudo.c:326 plugins/sudoers/visudo.c:591
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:726
+#: plugins/sudoers/sudoers.c:728
 #, c-format
 msgid "%s is not a regular file"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:729 toke.l:913
+#: plugins/sudoers/sudoers.c:731 toke.l:913
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:733 toke.l:920
+#: plugins/sudoers/sudoers.c:735 toke.l:920
 #, c-format
 msgid "%s is world writable"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:736 toke.l:925
+#: plugins/sudoers/sudoers.c:738 toke.l:925
 #, c-format
 msgid "%s is owned by gid %u, should be %u"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:763
+#: plugins/sudoers/sudoers.c:765
 #, c-format
 msgid "only root can use `-c %s'"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:780 plugins/sudoers/sudoers.c:782
+#: plugins/sudoers/sudoers.c:782 plugins/sudoers/sudoers.c:784
 #, c-format
 msgid "unknown login class: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:814
+#: plugins/sudoers/sudoers.c:816
 #, c-format
 msgid "unable to resolve host %s"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:866 plugins/sudoers/testsudoers.c:377
+#: plugins/sudoers/sudoers.c:868 plugins/sudoers/testsudoers.c:379
 #, c-format
 msgid "unknown group: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:292
+#: plugins/sudoers/sudoreplay.c:278
 #, c-format
 msgid "invalid filter option: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:305
+#: plugins/sudoers/sudoreplay.c:291
 #, c-format
 msgid "invalid max wait: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:311
+#: plugins/sudoers/sudoreplay.c:297
 #, c-format
 msgid "invalid speed factor: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:314 plugins/sudoers/visudo.c:179
+#: plugins/sudoers/sudoreplay.c:300 plugins/sudoers/visudo.c:191
 #, c-format
 msgid "%s version %s\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:339
+#: plugins/sudoers/sudoreplay.c:332
 #, c-format
 msgid "%s/%.2s/%.2s/%.2s/timing: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:345
+#: plugins/sudoers/sudoreplay.c:338
 #, c-format
 msgid "%s/%s/timing: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:363
+#: plugins/sudoers/sudoreplay.c:354
 #, c-format
 msgid "Replaying sudo session: %s\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:369
+#: plugins/sudoers/sudoreplay.c:360
 #, c-format
 msgid "Warning: your terminal is too small to properly replay the log.\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:370
+#: plugins/sudoers/sudoreplay.c:361
 #, c-format
 msgid "Log geometry is %d x %d, your terminal's geometry is %d x %d."
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:400
+#: plugins/sudoers/sudoreplay.c:391
 #, c-format
 msgid "unable to set tty to raw mode"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:416
+#: plugins/sudoers/sudoreplay.c:407
 #, c-format
 msgid "invalid timing file line: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:499
+#: plugins/sudoers/sudoreplay.c:490
 #, c-format
 msgid "writing to standard output"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:641 plugins/sudoers/sudoreplay.c:666
+#: plugins/sudoers/sudoreplay.c:634 plugins/sudoers/sudoreplay.c:659
 #, c-format
 msgid "ambiguous expression \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:683
+#: plugins/sudoers/sudoreplay.c:676
 #, c-format
 msgid "too many parenthesized expressions, max %d"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:694
+#: plugins/sudoers/sudoreplay.c:687
 #, c-format
 msgid "unmatched ')' in expression"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:700
+#: plugins/sudoers/sudoreplay.c:693
 #, c-format
 msgid "unknown search term \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:714
+#: plugins/sudoers/sudoreplay.c:707
 #, c-format
 msgid "%s requires an argument"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:718 plugins/sudoers/sudoreplay.c:1058
+#: plugins/sudoers/sudoreplay.c:711 plugins/sudoers/sudoreplay.c:1051
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:724
+#: plugins/sudoers/sudoreplay.c:717
 #, c-format
 msgid "could not parse date \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:737
+#: plugins/sudoers/sudoreplay.c:730
 #, c-format
 msgid "unmatched '(' in expression"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:739
+#: plugins/sudoers/sudoreplay.c:732
 #, c-format
 msgid "illegal trailing \"or\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:741
+#: plugins/sudoers/sudoreplay.c:734
 #, c-format
 msgid "illegal trailing \"!\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1182
+#: plugins/sudoers/sudoreplay.c:1179
 #, c-format
-msgid "usage: %s [-h] [-d directory] [-m max_wait] [-s speed_factor] ID\n"
+msgid "usage: %s [-h] [-d dir] [-m num] [-s num] ID\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1185
+#: plugins/sudoers/sudoreplay.c:1182
 #, c-format
-msgid "usage: %s [-h] [-d directory] -l [search expression]\n"
+msgid "usage: %s [-h] [-d dir] -l [search expression]\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1194
+#: plugins/sudoers/sudoreplay.c:1191
 #, c-format
 msgid ""
 "%s - replay sudo session logs\n"
 "\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1196
+#: plugins/sudoers/sudoreplay.c:1193
 msgid ""
 "\n"
 "Options:\n"
-"  -d directory     specify directory for session logs\n"
-"  -f filter        specify which I/O type to display\n"
-"  -h               display help message and exit\n"
-"  -l [expression]  list available session IDs that match expression\n"
-"  -m max_wait      max number of seconds to wait between events\n"
-"  -s speed_factor  speed up or slow down output\n"
-"  -V               display version information and exit"
+"  -d, --directory=dir  specify directory for session logs\n"
+"  -f, --filter=filter  specify which I/O type(s) to display\n"
+"  -h, --help           display help message and exit\n"
+"  -l, --list           list available session IDs, with optional expression\n"
+"  -m, --max-wait=num   max number of seconds to wait between events\n"
+"  -s, --speed=num      speed up or slow down output\n"
+"  -V, --version        display version information and exit"
 msgstr ""
 
-#: plugins/sudoers/testsudoers.c:328
+#: plugins/sudoers/testsudoers.c:330
 msgid "\thost  unmatched"
 msgstr ""
 
-#: plugins/sudoers/testsudoers.c:331
+#: plugins/sudoers/testsudoers.c:333
 msgid ""
 "\n"
 "Command allowed"
 msgstr ""
 
-#: plugins/sudoers/testsudoers.c:332
+#: plugins/sudoers/testsudoers.c:334
 msgid ""
 "\n"
 "Command denied"
 msgstr ""
 
-#: plugins/sudoers/testsudoers.c:332
+#: plugins/sudoers/testsudoers.c:334
 msgid ""
 "\n"
 "Command unmatched"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:129
+#: plugins/sudoers/timestamp.c:133
 #, c-format
 msgid "timestamp path too long: %s"
 msgstr ""
 
 #: plugins/sudoers/timestamp.c:203 plugins/sudoers/timestamp.c:247
-#: plugins/sudoers/timestamp.c:292
+#: plugins/sudoers/timestamp.c:290
 #, c-format
 msgid "%s owned by uid %u, should be uid %u"
 msgstr ""
@@ -1451,29 +1482,29 @@ msgstr ""
 msgid "%s writable by non-owner (0%o), should be mode 0700"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:286
+#: plugins/sudoers/timestamp.c:284
 #, c-format
 msgid "%s exists but is not a regular file (0%o)"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:298
+#: plugins/sudoers/timestamp.c:296
 #, c-format
 msgid "%s writable by non-owner (0%o), should be mode 0600"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:353
+#: plugins/sudoers/timestamp.c:351
 #, c-format
 msgid "timestamp too far in the future: %20.20s"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:407
+#: plugins/sudoers/timestamp.c:405
 #, c-format
-msgid "unable to remove %s, will reset to the epoch"
+msgid "unable to remove %s, will reset to the Unix epoch"
 msgstr ""
 
-#: plugins/sudoers/timestamp.c:414
+#: plugins/sudoers/timestamp.c:413
 #, c-format
-msgid "unable to reset %s to the epoch"
+msgid "unable to reset %s to the Unix epoch"
 msgstr ""
 
 #: plugins/sudoers/toke_util.c:176
@@ -1481,86 +1512,86 @@ msgstr ""
 msgid "fill_args: buffer overflow"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:180
+#: plugins/sudoers/visudo.c:193
 #, c-format
 msgid "%s grammar version %d\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:243 plugins/sudoers/visudo.c:530
+#: plugins/sudoers/visudo.c:257 plugins/sudoers/visudo.c:544
 #, c-format
 msgid "press return to edit %s: "
 msgstr ""
 
-#: plugins/sudoers/visudo.c:328 plugins/sudoers/visudo.c:334
+#: plugins/sudoers/visudo.c:342 plugins/sudoers/visudo.c:348
 #, c-format
 msgid "write error"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:416
+#: plugins/sudoers/visudo.c:430
 #, c-format
 msgid "unable to stat temporary file (%s), %s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:421
+#: plugins/sudoers/visudo.c:435
 #, c-format
 msgid "zero length temporary file (%s), %s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:427
+#: plugins/sudoers/visudo.c:441
 #, c-format
 msgid "editor (%s) failed, %s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:450
+#: plugins/sudoers/visudo.c:464
 #, c-format
 msgid "%s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:475
+#: plugins/sudoers/visudo.c:489
 #, c-format
 msgid "unable to re-open temporary file (%s), %s unchanged."
 msgstr ""
 
-#: plugins/sudoers/visudo.c:485
+#: plugins/sudoers/visudo.c:499
 #, c-format
 msgid "unabled to parse temporary file (%s), unknown error"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:521
+#: plugins/sudoers/visudo.c:535
 #, c-format
 msgid "internal error, unable to find %s in list!"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:579 plugins/sudoers/visudo.c:588
+#: plugins/sudoers/visudo.c:593 plugins/sudoers/visudo.c:602
 #, c-format
 msgid "unable to set (uid, gid) of %s to (%u, %u)"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:583 plugins/sudoers/visudo.c:593
+#: plugins/sudoers/visudo.c:597 plugins/sudoers/visudo.c:607
 #, c-format
 msgid "unable to change mode of %s to 0%o"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:610
+#: plugins/sudoers/visudo.c:624
 #, c-format
 msgid "%s and %s not on the same file system, using mv to rename"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:624
+#: plugins/sudoers/visudo.c:638
 #, c-format
 msgid "command failed: '%s %s %s', %s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:634
+#: plugins/sudoers/visudo.c:648
 #, c-format
 msgid "error renaming %s, %s unchanged"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:696
+#: plugins/sudoers/visudo.c:710
 msgid "What now? "
 msgstr ""
 
-#: plugins/sudoers/visudo.c:710
+#: plugins/sudoers/visudo.c:724
 msgid ""
 "Options are:\n"
 "  (e)dit sudoers file again\n"
@@ -1568,103 +1599,103 @@ msgid ""
 "  (Q)uit and save changes to sudoers file (DANGER!)\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:758
+#: plugins/sudoers/visudo.c:772
 #, c-format
 msgid "unable to run %s"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:784
+#: plugins/sudoers/visudo.c:798
 #, c-format
 msgid "%s: wrong owner (uid, gid) should be (%u, %u)\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:791
+#: plugins/sudoers/visudo.c:805
 #, c-format
 msgid "%s: bad permissions, should be mode 0%o\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:816
+#: plugins/sudoers/visudo.c:830
 #, c-format
 msgid "failed to parse %s file, unknown error"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:832
+#: plugins/sudoers/visudo.c:846
 #, c-format
 msgid "parse error in %s near line %d\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:835
+#: plugins/sudoers/visudo.c:849
 #, c-format
 msgid "parse error in %s\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:842 plugins/sudoers/visudo.c:847
+#: plugins/sudoers/visudo.c:857 plugins/sudoers/visudo.c:864
 #, c-format
 msgid "%s: parsed OK\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:894
+#: plugins/sudoers/visudo.c:912
 #, c-format
 msgid "%s busy, try again later"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:938
+#: plugins/sudoers/visudo.c:956
 #, c-format
 msgid "specified editor (%s) doesn't exist"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:961
+#: plugins/sudoers/visudo.c:979
 #, c-format
 msgid "unable to stat editor (%s)"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1009
+#: plugins/sudoers/visudo.c:1027
 #, c-format
 msgid "no editor found (editor path = %s)"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1101
+#: plugins/sudoers/visudo.c:1120
 #, c-format
 msgid "Error: cycle in %s_Alias `%s'"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1102
+#: plugins/sudoers/visudo.c:1121
 #, c-format
 msgid "Warning: cycle in %s_Alias `%s'"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1105
+#: plugins/sudoers/visudo.c:1127
 #, c-format
 msgid "Error: %s_Alias `%s' referenced but not defined"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1106
+#: plugins/sudoers/visudo.c:1128
 #, c-format
 msgid "Warning: %s_Alias `%s' referenced but not defined"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1241
+#: plugins/sudoers/visudo.c:1253
 #, c-format
 msgid "%s: unused %s_Alias %s"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1303
+#: plugins/sudoers/visudo.c:1315
 #, c-format
 msgid ""
 "%s - safely edit the sudoers file\n"
 "\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1305
+#: plugins/sudoers/visudo.c:1317
 msgid ""
 "\n"
 "Options:\n"
-"  -c          check-only mode\n"
-"  -f sudoers  specify sudoers file location\n"
-"  -h          display help message and exit\n"
-"  -q          less verbose (quiet) syntax error messages\n"
-"  -s          strict syntax checking\n"
-"  -V          display version information and exit"
+"  -c, --check      check-only mode\n"
+"  -f, --file=file  specify sudoers file location\n"
+"  -h, --help       display help message and exit\n"
+"  -q, --quiet      less verbose (quiet) syntax error messages\n"
+"  -s, --strict     strict syntax checking\n"
+"  -V, --version    display version information and exit"
 msgstr ""
 
 #: toke.l:886