regenerate .pot files for lbuf changes

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 247705f6a5961a235d37773220e89cb2a1ba3030..62f9562f6170aec8ecf004db92c52af3f04368c6 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -143,7 +143,8 @@ XGETTEXT_OPTS = -k_ -kN_ -dsudoers --copyright-holder="Todd C. Miller" \
                --package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
                --flag warning:1:c-format --flag warningx:1:c-format \
                --flag error:2:c-format --flag errorx:2:c-format \
-               --flag easprintf:3:c-format --foreign-user
+               --flag easprintf:3:c-format --flag lbuf_append:2:c-format \
+               --flag lbuf_append_quoted:3:c-format --foreign-user
 
 SUDODEP = $(srcdir)/sudoers.h $(srcdir)/defaults.h $(incdir)/error.h \
          $(incdir)/list.h $(srcdir)/logging.h $(incdir)/missing.h \

diff --git a/plugins/sudoers/po/sudoers.pot b/plugins/sudoers/po/sudoers.pot
index a58c9f76e32e2265242dbcd4bb651549aca9c152..3b86a838b4954cf5d97fa557558ae9b99e985475 100644 (file)
--- a/plugins/sudoers/po/sudoers.pot
+++ b/plugins/sudoers/po/sudoers.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sudo 1.8.x\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2011-05-20 13:19-0400\n"
+"POT-Creation-Date: 2011-05-20 15:33-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"
@@ -623,8 +623,8 @@ msgstr ""
 #: ../../../trunk/plugins/sudoers/find_path.c:68
 #: ../../../trunk/plugins/sudoers/find_path.c:107
 #: ../../../trunk/plugins/sudoers/find_path.c:122
-#: ../../../trunk/plugins/sudoers/iolog.c:124 toke.l:663 toke.l:814
-#: ../../../trunk/plugins/sudoers/sudoers.c:868
+#: ../../../trunk/plugins/sudoers/iolog.c:124
+#: ../../../trunk/plugins/sudoers/sudoers.c:868 toke.l:663 toke.l:814
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -758,46 +758,47 @@ msgstr ""
 msgid "sudo_ldap_build_pass1 allocation mismatch"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1550
+#: ../../../trunk/plugins/sudoers/ldap.c:1544
+#, c-format
 msgid ""
 "\n"
-"LDAP Role: "
+"LDAP Role: %s\n"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1552
+#: ../../../trunk/plugins/sudoers/ldap.c:1546
+#, c-format
 msgid ""
 "\n"
 "LDAP Role: UNKNOWN\n"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/ldap.c:2000
+#: ../../../trunk/plugins/sudoers/ldap.c:1593
+#, c-format
+msgid "    Order: %s\n"
+msgstr ""
+
+#: ../../../trunk/plugins/sudoers/ldap.c:1601
+#, c-format
+msgid "    Commands:\n"
+msgstr ""
+
+#: ../../../trunk/plugins/sudoers/ldap.c:1988
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/ldap.c:2031
+#: ../../../trunk/plugins/sudoers/ldap.c:2019
 #, c-format
 msgid ""
 "start_tls specified but LDAP libs do not support ldap_start_tls_s() or "
 "ldap_start_tls_s_np()"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/ldap.c:2262
+#: ../../../trunk/plugins/sudoers/ldap.c:2250
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr ""
 
-#: toke.l:667 toke.l:793 toke.l:818 toke.l:904
-#: ../../../trunk/plugins/sudoers/toke_util.c:111
-#: ../../../trunk/plugins/sudoers/toke_util.c:163
-#: ../../../trunk/plugins/sudoers/toke_util.c:202
-msgid "unable to allocate memory"
-msgstr ""
-
-#: toke.l:786
-msgid "too many levels of includes"
-msgstr ""
-
 #: ../../../trunk/plugins/sudoers/linux_audit.c:54
 #, c-format
 msgid "unable to open audit system"
@@ -891,23 +892,27 @@ msgstr ""
 msgid "parse error in %s near line %d"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/parse.c:374
+#: ../../../trunk/plugins/sudoers/parse.c:369
+#, c-format
 msgid ""
 "\n"
 "Sudoers entry:\n"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/parse.c:376
-msgid "RunAsUsers: "
+#: ../../../trunk/plugins/sudoers/parse.c:371
+#, c-format
+msgid "    RunAsUsers: "
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/parse.c:391
-msgid "RunAsGroups: "
+#: ../../../trunk/plugins/sudoers/parse.c:386
+#, c-format
+msgid "    RunAsGroups: "
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/parse.c:400
+#: ../../../trunk/plugins/sudoers/parse.c:395
+#, c-format
 msgid ""
-"Commands:\n"
+"    Commands:\n"
 "\t"
 msgstr ""
 
@@ -980,26 +985,21 @@ msgid "unable to get group vector"
 msgstr ""
 
 #: ../../../trunk/plugins/sudoers/sudo_nss.c:266
-msgid "Matching Defaults entries for "
-msgstr ""
-
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:267
-msgid " on this host:\n"
+#, c-format
+msgid "Matching Defaults entries for %s on this host:\n"
 msgstr ""
 
 #: ../../../trunk/plugins/sudoers/sudo_nss.c:279
-msgid "Runas and Command-specific defaults for "
-msgstr ""
-
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:291
-msgid "User "
+#, c-format
+msgid "Runas and Command-specific defaults for %s:\n"
 msgstr ""
 
 #: ../../../trunk/plugins/sudoers/sudo_nss.c:292
-msgid " may run the following commands on this host:\n"
+#, c-format
+msgid "User %s may run the following commands on this host:\n"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:301
+#: ../../../trunk/plugins/sudoers/sudo_nss.c:302
 #, c-format
 msgid "User %s is not allowed to run sudo on %s.\n"
 msgstr ""
@@ -1350,6 +1350,17 @@ msgid ""
 "Command unmatched"
 msgstr ""
 
+#: toke.l:667 toke.l:793 toke.l:818 toke.l:904
+#: ../../../trunk/plugins/sudoers/toke_util.c:111
+#: ../../../trunk/plugins/sudoers/toke_util.c:163
+#: ../../../trunk/plugins/sudoers/toke_util.c:202
+msgid "unable to allocate memory"
+msgstr ""
+
+#: toke.l:786
+msgid "too many levels of includes"
+msgstr ""
+
 #: ../../../trunk/plugins/sudoers/toke_util.c:213
 msgid "fill_args: buffer overflow"
 msgstr ""

diff --git a/src/Makefile.in b/src/Makefile.in
index c1e92d108765d60539b9777954951084028e6c89..3cea588c9efe8ba132d53d01a9647f9e335cd4c3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -93,7 +93,8 @@ XGETTEXT_OPTS = -k_ -kN_ -dsudo --copyright-holder="Todd C. Miller" \
                --package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
                --flag warning:1:c-format --flag warningx:1:c-format \
                --flag error:2:c-format --flag errorx:2:c-format \
-               --flag easprintf:3:c-format --foreign-user
+               --flag easprintf:3:c-format --flag lbuf_append:2:c-format \
+               --flag lbuf_append_quoted:3:c-format --foreign-user
 
 SUDODEP = $(srcdir)/sudo.h $(incdir)/sudo_plugin.h $(incdir)/alloc.h \
          $(incdir)/error.h $(incdir)/list.h $(incdir)/missing.h \

diff --git a/src/po/sudo.pot b/src/po/sudo.pot
index 56461eca66d429dce43878e14aee50977414b237..ff271906e9a18b35eb125c22e5eb53fbccf68979 100644 (file)
--- a/src/po/sudo.pot
+++ b/src/po/sudo.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sudo 1.8.x\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2011-05-20 13:19-0400\n"
+"POT-Creation-Date: 2011-05-20 15:33-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"
@@ -219,120 +219,123 @@ msgid ""
 msgstr ""
 
 #: ../../trunk/src/parse_args.c:515
+#, c-format
 msgid ""
-" - edit files as another user\n"
+"%s - edit files as another user\n"
 "\n"
 msgstr ""
 
 #: ../../trunk/src/parse_args.c:517
+#, c-format
 msgid ""
-" - execute a command as another user\n"
+"%s - execute a command as another user\n"
 "\n"
 msgstr ""
 
 #: ../../trunk/src/parse_args.c:522
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:526
+#: ../../trunk/src/parse_args.c:525
 msgid "use helper program for password prompting\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:530
+#: ../../trunk/src/parse_args.c:528
 msgid "use specified BSD authentication type\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:533
+#: ../../trunk/src/parse_args.c:530
 msgid "run command in the background\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:536
+#: ../../trunk/src/parse_args.c:532
 msgid "close all file descriptors >= fd\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:540
+#: ../../trunk/src/parse_args.c:535
 msgid "run command with specified login class\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:544
+#: ../../trunk/src/parse_args.c:538
 msgid "preserve user environment when executing command\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:547
+#: ../../trunk/src/parse_args.c:540
 msgid "edit files instead of running a command\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:550
+#: ../../trunk/src/parse_args.c:542
 msgid "execute command as the specified group\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:553
+#: ../../trunk/src/parse_args.c:544
 msgid "set HOME variable to target user's home dir.\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:556
+#: ../../trunk/src/parse_args.c:546
 msgid "display help message and exit\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:559
+#: ../../trunk/src/parse_args.c:548
 msgid "run a login shell as target user\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:562
+#: ../../trunk/src/parse_args.c:550
 msgid "remove timestamp file completely\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:565
+#: ../../trunk/src/parse_args.c:552
 msgid "invalidate timestamp file\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:568
+#: ../../trunk/src/parse_args.c:554
 msgid "list user's available commands\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:571
+#: ../../trunk/src/parse_args.c:556
 msgid "non-interactive mode, will not prompt user\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:574
+#: ../../trunk/src/parse_args.c:558
 msgid "preserve group vector instead of setting to target's\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:577
+#: ../../trunk/src/parse_args.c:560
 msgid "use specified password prompt\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:581 ../../trunk/src/parse_args.c:592
+#: ../../trunk/src/parse_args.c:563 ../../trunk/src/parse_args.c:571
 msgid "create SELinux security context with specified role\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:585
+#: ../../trunk/src/parse_args.c:566
 msgid "read password from standard input\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:588
+#: ../../trunk/src/parse_args.c:568
 msgid "run a shell as target user\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:596
+#: ../../trunk/src/parse_args.c:574
 msgid "when listing, list specified user's privileges\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:599
+#: ../../trunk/src/parse_args.c:576
 msgid "run command (or edit file) as specified user\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:602
+#: ../../trunk/src/parse_args.c:578
 msgid "display version information and exit\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:605
+#: ../../trunk/src/parse_args.c:580
 msgid "update user's timestamp without running a command\n"
 msgstr ""
 
-#: ../../trunk/src/parse_args.c:608
+#: ../../trunk/src/parse_args.c:582
 msgid "stop processing command line arguments\n"
 msgstr ""