Update localization files.

13 files changed, 265 insertions, 225 deletions

diff --git a/locale/cups.pot b/locale/cups.pot
index 4b803ae4b..97250c2ff 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b7\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-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"
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid " PASS"
 msgstr ""
 
-#: test/ippfind.c:2803
+#: tools/ippfind.c:2803
 msgid "! expression            Unary NOT of expression"
 msgstr ""
 
@@ -1342,7 +1342,7 @@ msgstr ""
 msgid "%s: Bad printer URI \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:768 test/ipptool.c:410
+#: tools/ippfind.c:768 tools/ipptool.c:412
 #, c-format
 msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
@@ -1567,17 +1567,17 @@ msgstr ""
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
 
-#: test/ipptool.c:332
+#: tools/ipptool.c:334
 #, c-format
 msgid "%s: Missing filename for \"-P\"."
 msgstr ""
 
-#: test/ippfind.c:740 test/ipptool.c:369
+#: tools/ippfind.c:740 tools/ipptool.c:371
 #, c-format
 msgid "%s: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ippfind.c:753 test/ipptool.c:383
+#: tools/ippfind.c:753 tools/ipptool.c:385
 #, c-format
 msgid "%s: Missing version for \"-V\"."
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #: berkeley/lpq.c:86 berkeley/lpr.c:74 berkeley/lprm.c:71 systemv/cancel.c:85
 #: systemv/cupsaccept.c:95 systemv/lp.c:98 systemv/lpadmin.c:249
 #: systemv/lpinfo.c:192 systemv/lpmove.c:69 systemv/lpstat.c:91
-#: test/ipptool.c:314 test/ipptool.c:358
+#: tools/ipptool.c:316 tools/ipptool.c:360
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
@@ -1630,7 +1630,7 @@ msgstr ""
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
 
-#: test/ipptool.c:275 test/ipptool.c:341
+#: tools/ipptool.c:277 tools/ipptool.c:343
 #, c-format
 msgid "%s: Unable to open \"%s\": %s"
 msgstr ""
@@ -1680,12 +1680,12 @@ msgstr ""
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: test/ippeveprinter.c:378 test/ippeveprinter.c:555 test/ippfind.c:627
+#: tools/ippeveprinter.c:378 tools/ippeveprinter.c:555 tools/ippfind.c:627
 #, c-format
 msgid "%s: Unknown option \"%s\"."
 msgstr ""
 
-#: test/ippeveprinter.c:544 test/ippfind.c:919 test/ipptool.c:604
+#: tools/ippeveprinter.c:544 tools/ippfind.c:919 tools/ipptool.c:606
 #, c-format
 msgid "%s: Unknown option \"-%c\"."
 msgstr ""
@@ -1720,7 +1720,7 @@ msgstr ""
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: test/ippfind.c:2802
+#: tools/ippfind.c:2802
 msgid "( expressions )         Group expressions"
 msgstr ""
 
@@ -1732,23 +1732,23 @@ msgstr ""
 msgid "-# num-copies           Specify the number of copies to print"
 msgstr ""
 
-#: systemv/cupsctl.c:195
+#: systemv/cupsctl.c:236
 msgid "--[no-]debug-logging    Turn debug logging on/off"
 msgstr ""
 
-#: systemv/cupsctl.c:196
+#: systemv/cupsctl.c:237
 msgid "--[no-]remote-admin     Turn remote administration on/off"
 msgstr ""
 
-#: systemv/cupsctl.c:197
+#: systemv/cupsctl.c:238
 msgid "--[no-]remote-any       Allow/prevent access from the Internet"
 msgstr ""
 
-#: systemv/cupsctl.c:198
+#: systemv/cupsctl.c:239
 msgid "--[no-]share-printers   Turn printer sharing on/off"
 msgstr ""
 
-#: systemv/cupsctl.c:199
+#: systemv/cupsctl.c:240
 msgid "--[no-]user-cancel-any  Allow/prevent users to cancel any job"
 msgstr ""
 
@@ -1756,7 +1756,7 @@ msgstr ""
 msgid "--device-id device-id   Show models matching the given IEEE 1284 device ID"
 msgstr ""
 
-#: test/ippfind.c:2785
+#: tools/ippfind.c:2785
 msgid "--domain regex          Match domain to regular expression"
 msgstr ""
 
@@ -1766,17 +1766,17 @@ msgid ""
 "                        Exclude the specified URI schemes"
 msgstr ""
 
-#: test/ippfind.c:2786
+#: tools/ippfind.c:2786
 msgid ""
 "--exec utility [argument ...] ;\n"
 "                        Execute program if true"
 msgstr ""
 
-#: test/ippfind.c:2805
+#: tools/ippfind.c:2805
 msgid "--false                 Always false"
 msgstr ""
 
-#: test/ippeveprinter.c:7587
+#: tools/ippeveprinter.c:7637
 msgid "--help                  Show program help"
 msgstr ""
 
@@ -1784,7 +1784,7 @@ msgstr ""
 msgid "--hold                  Hold new jobs"
 msgstr ""
 
-#: test/ippfind.c:2788
+#: tools/ippfind.c:2788
 msgid "--host regex            Match hostname to regular expression"
 msgstr ""
 
@@ -1794,7 +1794,7 @@ msgid ""
 "                        Include only the specified URI schemes"
 msgstr ""
 
-#: test/ipptool.c:4301
+#: tools/ipptool.c:4308
 msgid "--ippserver filename    Produce ippserver attribute file"
 msgstr ""
 
@@ -1802,11 +1802,11 @@ msgstr ""
 msgid "--language locale       Show models matching the given locale"
 msgstr ""
 
-#: test/ippfind.c:2790
+#: tools/ippfind.c:2790
 msgid "--local                 True if service is local"
 msgstr ""
 
-#: test/ippfind.c:2789
+#: tools/ippfind.c:2789
 msgid "--ls                    List attributes"
 msgstr ""
 
@@ -1814,31 +1814,31 @@ msgstr ""
 msgid "--make-and-model name   Show models matching the given make and model name"
 msgstr ""
 
-#: test/ippfind.c:2791
+#: tools/ippfind.c:2791
 msgid "--name regex            Match service name to regular expression"
 msgstr ""
 
-#: test/ippeveprinter.c:7588
+#: tools/ippeveprinter.c:7638
 msgid "--no-web-forms          Disable web forms for media and supplies"
 msgstr ""
 
-#: test/ippfind.c:2804
+#: tools/ippfind.c:2804
 msgid "--not expression        Unary NOT of expression"
 msgstr ""
 
-#: test/ippfind.c:2792
+#: tools/ippfind.c:2792
 msgid "--path regex            Match resource path to regular expression"
 msgstr ""
 
-#: test/ippfind.c:2793
+#: tools/ippfind.c:2793
 msgid "--port number[-number]  Match port to number or range"
 msgstr ""
 
-#: test/ippfind.c:2794
+#: tools/ippfind.c:2794
 msgid "--print                 Print URI if true"
 msgstr ""
 
-#: test/ippfind.c:2795
+#: tools/ippfind.c:2795
 msgid "--print-name            Print service name if true"
 msgstr ""
 
@@ -1846,7 +1846,7 @@ msgstr ""
 msgid "--product name          Show models matching the given PostScript product"
 msgstr ""
 
-#: test/ippfind.c:2796
+#: tools/ippfind.c:2796
 msgid "--quiet                 Quietly report match via exit code"
 msgstr ""
 
@@ -1854,11 +1854,11 @@ msgstr ""
 msgid "--release               Release previously held jobs"
 msgstr ""
 
-#: test/ippfind.c:2797
+#: tools/ippfind.c:2797
 msgid "--remote                True if service is remote"
 msgstr ""
 
-#: test/ipptool.c:4302
+#: tools/ipptool.c:4309
 msgid ""
 "--stop-after-include-error\n"
 "                        Stop tests after a failed INCLUDE"
@@ -1868,27 +1868,27 @@ msgstr ""
 msgid "--timeout seconds       Specify the maximum number of seconds to discover devices"
 msgstr ""
 
-#: test/ippfind.c:2806
+#: tools/ippfind.c:2806
 msgid "--true                  Always true"
 msgstr ""
 
-#: test/ippfind.c:2798
+#: tools/ippfind.c:2798
 msgid "--txt key               True if the TXT record contains the key"
 msgstr ""
 
-#: test/ippfind.c:2799
+#: tools/ippfind.c:2799
 msgid "--txt-* regex           Match TXT record key to regular expression"
 msgstr ""
 
-#: test/ippfind.c:2800
+#: tools/ippfind.c:2800
 msgid "--uri regex             Match URI to regular expression"
 msgstr ""
 
-#: test/ippeveprinter.c:7589 test/ippfind.c:2770
+#: tools/ippeveprinter.c:7639 tools/ippfind.c:2770
 msgid "--version               Show program version"
 msgstr ""
 
-#: test/ipptool.c:4304
+#: tools/ipptool.c:4311
 msgid "--version               Show version"
 msgstr ""
 
@@ -1944,7 +1944,7 @@ msgstr ""
 msgid "-2"
 msgstr ""
 
-#: test/ippeveprinter.c:7590
+#: tools/ippeveprinter.c:7640
 msgid "-2                      Set 2-sided printing support (default=1-sided)"
 msgstr ""
 
@@ -1972,7 +1972,7 @@ msgstr ""
 msgid "-4"
 msgstr ""
 
-#: test/ippfind.c:2766 test/ipptool.c:4305
+#: tools/ippfind.c:2766 tools/ipptool.c:4312
 msgid "-4                      Connect using IPv4"
 msgstr ""
 
@@ -2000,7 +2000,7 @@ msgstr ""
 msgid "-6"
 msgstr ""
 
-#: test/ippfind.c:2767 test/ipptool.c:4306
+#: tools/ippfind.c:2767 tools/ipptool.c:4313
 msgid "-6                      Connect using IPv6"
 msgstr ""
 
@@ -2048,7 +2048,7 @@ msgstr ""
 msgid "-95"
 msgstr ""
 
-#: test/ipptool.c:4307
+#: tools/ipptool.c:4314
 msgid "-C                      Send requests using chunking (default)"
 msgstr ""
 
@@ -2056,7 +2056,7 @@ msgstr ""
 msgid "-D description          Specify the textual description of the printer"
 msgstr ""
 
-#: test/ippeveprinter.c:7591
+#: tools/ippeveprinter.c:7641
 msgid "-D device-uri           Set the device URI for the printer"
 msgstr ""
 
@@ -2065,13 +2065,13 @@ msgid "-E                      Enable and accept jobs on the printer (after -p)"
 msgstr ""
 
 #: berkeley/lpq.c:644 berkeley/lpr.c:433 berkeley/lprm.c:234
-#: systemv/cancel.c:403 systemv/cupsaccept.c:244 systemv/cupsctl.c:192
+#: systemv/cancel.c:403 systemv/cupsaccept.c:244 systemv/cupsctl.c:233
 #: systemv/lp.c:752 systemv/lpadmin.c:1619 systemv/lpinfo.c:498
 #: systemv/lpmove.c:217 systemv/lpoptions.c:540 systemv/lpstat.c:2045
 msgid "-E                      Encrypt the connection to the server"
 msgstr ""
 
-#: test/ipptool.c:4308
+#: tools/ipptool.c:4315
 msgid "-E                      Test with encryption using HTTP Upgrade to TLS"
 msgstr ""
 
@@ -2107,7 +2107,7 @@ msgstr ""
 msgid "-H server[:port]        Connect to the named server and port"
 msgstr ""
 
-#: test/ipptool.c:4309
+#: tools/ipptool.c:4316
 msgid "-I                      Ignore errors"
 msgstr ""
 
@@ -2117,11 +2117,11 @@ msgid ""
 "                          Ignore specific warnings"
 msgstr ""
 
-#: test/ippeveprinter.c:7593
+#: tools/ippeveprinter.c:7643
 msgid "-K keypath              Set location of server X.509 certificates and keys."
 msgstr ""
 
-#: test/ipptool.c:4310
+#: tools/ipptool.c:4317
 msgid "-L                      Send requests using content-length"
 msgstr ""
 
@@ -2129,7 +2129,7 @@ msgstr ""
 msgid "-L location             Specify the textual location of the printer"
 msgstr ""
 
-#: test/ippeveprinter.c:7595
+#: tools/ippeveprinter.c:7645
 msgid "-M manufacturer         Set manufacturer name (default=Test)"
 msgstr ""
 
@@ -2141,15 +2141,15 @@ msgstr ""
 msgid "-P destination          Specify the destination"
 msgstr ""
 
-#: test/ipptool.c:4311
+#: tools/ipptool.c:4318
 msgid "-P filename.plist       Produce XML plist to a file and test report to standard output"
 msgstr ""
 
-#: test/ippeveprinter.c:7596
+#: tools/ippeveprinter.c:7646
 msgid "-P filename.ppd         Load printer attributes from PPD file"
 msgstr ""
 
-#: test/ippfind.c:2772
+#: tools/ippfind.c:2772
 msgid "-P number[-number]      Match port to number or range"
 msgstr ""
 
@@ -2169,15 +2169,15 @@ msgstr ""
 msgid "-R root-directory       Set alternate root"
 msgstr ""
 
-#: test/ipptool.c:4312
+#: tools/ipptool.c:4319
 msgid "-S                      Test with encryption using HTTPS"
 msgstr ""
 
-#: test/ippfind.c:2768
+#: tools/ippfind.c:2768
 msgid "-T seconds              Set the browse timeout in seconds"
 msgstr ""
 
-#: test/ipptool.c:4313
+#: tools/ipptool.c:4320
 msgid "-T seconds              Set the receive/send timeout in seconds"
 msgstr ""
 
@@ -2192,11 +2192,11 @@ msgstr ""
 msgid "-U username             Specify the username to use for authentication"
 msgstr ""
 
-#: systemv/cupsctl.c:194
+#: systemv/cupsctl.c:235
 msgid "-U username             Specify username to use for authentication"
 msgstr ""
 
-#: test/ippeveprinter.c:7597 test/ippfind.c:2769 test/ipptool.c:4314
+#: tools/ippeveprinter.c:7647 tools/ippfind.c:2769 tools/ipptool.c:4321
 msgid "-V version              Set default IPP version"
 msgstr ""
 
@@ -2214,7 +2214,7 @@ msgid ""
 "                          Issue warnings instead of errors"
 msgstr ""
 
-#: test/ipptool.c:4315
+#: tools/ipptool.c:4322
 msgid "-X                      Produce XML plist instead of plain text"
 msgstr ""
 
@@ -2230,7 +2230,7 @@ msgstr ""
 msgid "-a [destination(s)]     Show the accepting state of destinations"
 msgstr ""
 
-#: test/ippeveprinter.c:7598
+#: tools/ippeveprinter.c:7648
 msgid "-a filename.conf        Load printer attributes from conf file"
 msgstr ""
 
@@ -2238,7 +2238,7 @@ msgstr ""
 msgid "-c                      Make a copy of the print file(s)"
 msgstr ""
 
-#: test/ipptool.c:4316
+#: tools/ipptool.c:4323
 msgid "-c                      Produce CSV output"
 msgstr ""
 
@@ -2250,7 +2250,7 @@ msgstr ""
 msgid "-c class                Add the named destination to a class"
 msgstr ""
 
-#: test/ippeveprinter.c:7599
+#: tools/ippeveprinter.c:7649
 msgid "-c command              Set print command"
 msgstr ""
 
@@ -2270,15 +2270,15 @@ msgstr ""
 msgid "-d destination          Set the named destination as the server default"
 msgstr ""
 
-#: test/ipptool.c:4317
+#: tools/ipptool.c:4324
 msgid "-d name=value           Set named variable to value"
 msgstr ""
 
-#: test/ippfind.c:2773
+#: tools/ippfind.c:2773
 msgid "-d regex                Match domain to regular expression"
 msgstr ""
 
-#: test/ippeveprinter.c:7600
+#: tools/ippeveprinter.c:7650
 msgid "-d spool-directory      Set spool directory"
 msgstr ""
 
@@ -2290,11 +2290,11 @@ msgstr ""
 msgid "-f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:4318
+#: tools/ipptool.c:4325
 msgid "-f filename             Set default request filename"
 msgstr ""
 
-#: test/ippeveprinter.c:7601
+#: tools/ippeveprinter.c:7651
 msgid "-f type/subtype[,...]   Set supported file types"
 msgstr ""
 
@@ -2302,22 +2302,22 @@ msgstr ""
 msgid "-h                      Show this usage message."
 msgstr ""
 
-#: test/ipptool.c:4319
+#: tools/ipptool.c:4326
 msgid "-h                      Validate HTTP response headers"
 msgstr ""
 
-#: test/ippfind.c:2774
+#: tools/ippfind.c:2774
 msgid "-h regex                Match hostname to regular expression"
 msgstr ""
 
 #: berkeley/lpq.c:645 berkeley/lprm.c:235 systemv/cancel.c:404
-#: systemv/cupsaccept.c:245 systemv/cupsctl.c:193 systemv/lp.c:753
+#: systemv/cupsaccept.c:245 systemv/cupsctl.c:234 systemv/lp.c:753
 #: systemv/lpadmin.c:1621 systemv/lpinfo.c:499 systemv/lpmove.c:218
 #: systemv/lpoptions.c:541 systemv/lpstat.c:2046
 msgid "-h server[:port]        Connect to the named server and port"
 msgstr ""
 
-#: test/ippeveprinter.c:7602
+#: tools/ippeveprinter.c:7652
 msgid "-i iconfile.png         Set icon file"
 msgstr ""
 
@@ -2329,19 +2329,19 @@ msgstr ""
 msgid "-i ppd-file             Specify a PPD file for the printer"
 msgstr ""
 
-#: test/ipptool.c:4320
+#: tools/ipptool.c:4327
 msgid "-i seconds              Repeat the last file with the given time interval"
 msgstr ""
 
-#: test/ippeveprinter.c:7603
+#: tools/ippeveprinter.c:7653
 msgid "-k                      Keep job spool files"
 msgstr ""
 
-#: test/ippfind.c:2775
+#: tools/ippfind.c:2775
 msgid "-l                      List attributes"
 msgstr ""
 
-#: test/ipptool.c:4321
+#: tools/ipptool.c:4328
 msgid "-l                      Produce plain text output"
 msgstr ""
 
@@ -2357,7 +2357,7 @@ msgstr ""
 msgid "-l                      Show verbose (long) output"
 msgstr ""
 
-#: test/ippeveprinter.c:7604
+#: tools/ippeveprinter.c:7654
 msgid "-l location             Set location of printer"
 msgstr ""
 
@@ -2373,7 +2373,7 @@ msgstr ""
 msgid "-m everywhere           Specify the printer is compatible with IPP Everywhere"
 msgstr ""
 
-#: test/ippeveprinter.c:7605
+#: tools/ippeveprinter.c:7655
 msgid "-m model                Set model name (default=Printer)"
 msgstr ""
 
@@ -2381,11 +2381,11 @@ msgstr ""
 msgid "-m model                Specify a standard model/PPD file for the printer"
 msgstr ""
 
-#: test/ipptool.c:4322
+#: tools/ipptool.c:4329
 msgid "-n count                Repeat the last file the given number of times"
 msgstr ""
 
-#: test/ippeveprinter.c:7606
+#: tools/ippeveprinter.c:7656
 msgid "-n hostname             Set hostname for printer"
 msgstr ""
 
@@ -2393,7 +2393,7 @@ msgstr ""
 msgid "-n num-copies           Specify the number of copies to print"
 msgstr ""
 
-#: test/ippfind.c:2776
+#: tools/ippfind.c:2776
 msgid "-n regex                Match service name to regular expression"
 msgstr ""
 
@@ -2497,7 +2497,7 @@ msgid ""
 "                        Specify 2-sided landscape printing"
 msgstr ""
 
-#: test/ippfind.c:2777
+#: tools/ippfind.c:2777
 msgid "-p                      Print URI if true"
 msgstr ""
 
@@ -2513,15 +2513,15 @@ msgstr ""
 msgid "-p destination          Specify/add the named destination"
 msgstr ""
 
-#: test/ippeveprinter.c:7607
+#: tools/ippeveprinter.c:7657
 msgid "-p port                 Set port number for printer"
 msgstr ""
 
-#: test/ippfind.c:2778
+#: tools/ippfind.c:2778
 msgid "-q                      Quietly report match via exit code"
 msgstr ""
 
-#: systemv/cupstestppd.c:3863 test/ipptool.c:4323
+#: systemv/cupstestppd.c:3863 tools/ipptool.c:4330
 msgid "-q                      Run silently"
 msgstr ""
 
@@ -2541,7 +2541,7 @@ msgstr ""
 msgid "-r                      Show whether the CUPS server is running"
 msgstr ""
 
-#: test/ippfind.c:2779
+#: tools/ippfind.c:2779
 msgid "-r                      True if service is remote"
 msgstr ""
 
@@ -2557,7 +2557,7 @@ msgstr ""
 msgid "-r reason               Specify a reason message that others can see"
 msgstr ""
 
-#: test/ippeveprinter.c:7608
+#: tools/ippeveprinter.c:7658
 msgid "-r subtype,[subtype]    Set DNS-SD service subtype"
 msgstr ""
 
@@ -2565,7 +2565,7 @@ msgstr ""
 msgid "-s                      Be silent"
 msgstr ""
 
-#: test/ippfind.c:2780
+#: tools/ippfind.c:2780
 msgid "-s                      Print service name if true"
 msgstr ""
 
@@ -2577,11 +2577,11 @@ msgstr ""
 msgid "-s cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: test/ippeveprinter.c:7609
+#: tools/ippeveprinter.c:7659
 msgid "-s speed[,color-speed]  Set speed in pages per minute"
 msgstr ""
 
-#: test/ipptool.c:4324
+#: tools/ipptool.c:4331
 msgid "-t                      Produce a test report"
 msgstr ""
 
@@ -2593,7 +2593,7 @@ msgstr ""
 msgid "-t                      Test the configuration file."
 msgstr ""
 
-#: test/ippfind.c:2781
+#: tools/ippfind.c:2781
 msgid "-t key                  True if the TXT record contains the key"
 msgstr ""
 
@@ -2621,11 +2621,11 @@ msgstr ""
 msgid "-u owner                Specify the owner to use for jobs"
 msgstr ""
 
-#: test/ippfind.c:2782
+#: tools/ippfind.c:2782
 msgid "-u regex                Match URI to regular expression"
 msgstr ""
 
-#: systemv/cupstestppd.c:3865 test/ippeveprinter.c:7610 test/ipptool.c:4325
+#: systemv/cupstestppd.c:3865 tools/ippeveprinter.c:7660 tools/ipptool.c:4332
 msgid "-v                      Be verbose"
 msgstr ""
 
@@ -2657,7 +2657,7 @@ msgstr ""
 msgid "-x destination          Remove the named destination"
 msgstr ""
 
-#: test/ippfind.c:2783
+#: tools/ippfind.c:2783
 msgid ""
 "-x utility [argument ...] ;\n"
 "                        Execute program if true"
@@ -3899,11 +3899,11 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: cups/tls-darwin.c:747 cups/tls-gnutls.c:582
+#: cups/tls-darwin.c:748 cups/tls-gnutls.c:582
 msgid "Credentials do not validate against site CA certificate."
 msgstr ""
 
-#: cups/tls-darwin.c:758 cups/tls-gnutls.c:599
+#: cups/tls-darwin.c:759 cups/tls-gnutls.c:599
 msgid "Credentials have expired."
 msgstr ""
 
@@ -4281,7 +4281,7 @@ msgstr ""
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: test/ippfind.c:2822
+#: tools/ippfind.c:2822
 msgid "Environment Variables:"
 msgstr ""
 
@@ -4362,7 +4362,7 @@ msgstr ""
 msgid "Expectation Failed"
 msgstr ""
 
-#: test/ippfind.c:2771
+#: tools/ippfind.c:2771
 msgid "Expressions:"
 msgstr ""
 
@@ -4569,37 +4569,37 @@ msgstr ""
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
-#: test/ippfind.c:2823
+#: tools/ippfind.c:2823
 msgid "IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: test/ippfind.c:2824
+#: tools/ippfind.c:2824
 msgid ""
 "IPPFIND_SERVICE_HOSTNAME\n"
 "                        Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2826
+#: tools/ippfind.c:2826
 msgid "IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2827
+#: tools/ippfind.c:2827
 msgid "IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: test/ippfind.c:2828
+#: tools/ippfind.c:2828
 msgid "IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2829
+#: tools/ippfind.c:2829
 msgid "IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2830
+#: tools/ippfind.c:2830
 msgid "IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: test/ippfind.c:2831
+#: tools/ippfind.c:2831
 msgid "IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
@@ -4879,7 +4879,7 @@ msgstr ""
 msgid "List Available Printers"
 msgstr ""
 
-#: test/ippeveprinter.c:593
+#: tools/ippeveprinter.c:593
 #, c-format
 msgid "Listening on port %d."
 msgstr ""
@@ -5012,7 +5012,7 @@ msgid ""
 "        device-id = %s"
 msgstr ""
 
-#: test/ippfind.c:2801
+#: tools/ippfind.c:2801
 msgid "Modifiers:"
 msgstr ""
 
@@ -5052,11 +5052,11 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: cups/tls-darwin.c:689 cups/tls-gnutls.c:524
+#: cups/tls-darwin.c:690 cups/tls-gnutls.c:524
 msgid "New credentials are not valid for name."
 msgstr ""
 
-#: cups/tls-darwin.c:679 cups/tls-gnutls.c:514
+#: cups/tls-darwin.c:680 cups/tls-gnutls.c:514
 msgid "New credentials are older than stored credentials."
 msgstr ""
 
@@ -5101,7 +5101,7 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/tls-darwin.c:629 cups/tls-gnutls.c:461
+#: cups/tls-darwin.c:630 cups/tls-gnutls.c:461
 msgid "No common name specified."
 msgstr ""
 
@@ -5182,7 +5182,7 @@ msgstr ""
 msgid "No request-id"
 msgstr ""
 
-#: cups/tls-darwin.c:709 cups/tls-gnutls.c:544
+#: cups/tls-darwin.c:710 cups/tls-gnutls.c:544
 msgid "No stored credentials, not valid for name."
 msgstr ""
 
@@ -5296,10 +5296,10 @@ msgstr ""
 
 #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232
 #: scheduler/cupsfilter.c:1476 scheduler/main.c:2112 systemv/cancel.c:401
-#: systemv/cupsaccept.c:243 systemv/cupsctl.c:191 systemv/cupstestppd.c:3857
+#: systemv/cupsaccept.c:243 systemv/cupsctl.c:232 systemv/cupstestppd.c:3857
 #: systemv/lp.c:750 systemv/lpadmin.c:1615 systemv/lpinfo.c:497
 #: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044
-#: test/ippeveprinter.c:7586 test/ippfind.c:2765 test/ipptool.c:4300
+#: tools/ippeveprinter.c:7636 tools/ippfind.c:2765 tools/ipptool.c:4307
 #: ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119
 #: ppdc/ppdmerge.cxx:356 ppdc/ppdpo.cxx:243
 msgid "Options:"
@@ -5619,7 +5619,7 @@ msgstr ""
 msgid "See remote printer."
 msgstr ""
 
-#: cups/tls-darwin.c:764 cups/tls-gnutls.c:606
+#: cups/tls-darwin.c:765 cups/tls-gnutls.c:606
 msgid "Self-signed credentials are blocked."
 msgstr ""
 
@@ -5643,7 +5643,7 @@ msgstr ""
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/tls-darwin.c:1274 cups/tls-gnutls.c:1298
+#: cups/tls-darwin.c:1275 cups/tls-gnutls.c:1298
 msgid "Server credentials not set."
 msgstr ""
 
@@ -5718,7 +5718,7 @@ msgstr ""
 msgid "Subscription #%d does not exist."
 msgstr ""
 
-#: test/ippfind.c:2812
+#: tools/ippfind.c:2812
 msgid "Substitutions:"
 msgstr ""
 
@@ -5950,7 +5950,7 @@ msgstr ""
 msgid "Tray 4"
 msgstr ""
 
-#: cups/tls-darwin.c:669 cups/tls-darwin.c:751 cups/tls-gnutls.c:504
+#: cups/tls-darwin.c:670 cups/tls-darwin.c:752 cups/tls-gnutls.c:504
 #: cups/tls-gnutls.c:586
 msgid "Trust on first use is disabled."
 msgstr ""
@@ -6036,7 +6036,7 @@ msgstr ""
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: test/ippeveprinter.c:1425
+#: tools/ippeveprinter.c:1471
 msgid "Unable to allocate memory for printer"
 msgstr ""
 
@@ -6088,7 +6088,7 @@ msgstr ""
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/tls-darwin.c:635 cups/tls-gnutls.c:467
+#: cups/tls-darwin.c:636 cups/tls-gnutls.c:467
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -6100,11 +6100,11 @@ msgstr ""
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1565 cups/tls-gnutls.c:1510
+#: cups/tls-darwin.c:1566 cups/tls-gnutls.c:1510
 msgid "Unable to create server credentials."
 msgstr ""
 
-#: test/ippeveprinter.c:615
+#: tools/ippeveprinter.c:615
 #, c-format
 msgid "Unable to create spool directory \"%s\": %s"
 msgstr ""
@@ -6129,36 +6129,36 @@ msgstr ""
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1792
+#: cups/tls-darwin.c:1793
 #, c-format
 msgid "Unable to establish a secure connection to host (%d)."
 msgstr ""
 
-#: cups/tls-darwin.c:1753
+#: cups/tls-darwin.c:1754
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1743
+#: cups/tls-darwin.c:1744
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1738
+#: cups/tls-darwin.c:1739
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1748
+#: cups/tls-darwin.c:1749
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1758
+#: cups/tls-darwin.c:1759
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1733
+#: cups/tls-darwin.c:1734
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1728
+#: cups/tls-darwin.c:1729
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
@@ -6166,7 +6166,7 @@ msgstr ""
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
-#: test/ippeveprinter.c:1400 test/ippeveprinter.c:1410
+#: tools/ippeveprinter.c:1446 tools/ippeveprinter.c:1456
 #, c-format
 msgid "Unable to execute command \"%s\": %s"
 msgstr ""
@@ -6179,7 +6179,7 @@ msgstr ""
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1578
+#: cups/tls-darwin.c:1579
 msgid "Unable to find server credentials."
 msgstr ""
 
@@ -6286,8 +6286,8 @@ msgstr ""
 msgid "Unable to read print data."
 msgstr ""
 
-#: test/ippeveprinter.c:6533 test/ippeveprinter.c:6551
-#: test/ippeveprinter.c:6570 test/ippeveprinter.c:6584
+#: tools/ippeveprinter.c:6585 tools/ippeveprinter.c:6603
+#: tools/ippeveprinter.c:6622 tools/ippeveprinter.c:6636
 #, c-format
 msgid "Unable to register \"%s.%s\": %d"
 msgstr ""
@@ -6358,7 +6358,7 @@ msgstr ""
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: test/ippeveprinter.c:3780
+#: tools/ippeveprinter.c:3832
 #, c-format
 msgid "Unknown directive \"%s\" on line %d of \"%s\" ignored."
 msgstr ""
@@ -6531,7 +6531,7 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-#: systemv/cupsctl.c:190
+#: systemv/cupsctl.c:231
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
@@ -6549,11 +6549,11 @@ msgid ""
 "       program | cupstestppd [options] -"
 msgstr ""
 
-#: test/ippeveprinter.c:7585
+#: tools/ippeveprinter.c:7635
 msgid "Usage: ippeveprinter [options] \"name\""
 msgstr ""
 
-#: test/ippfind.c:2759
+#: tools/ippfind.c:2759
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
 "       ippfind [options] name[.regtype[.domain.]] ... [expression]\n"
@@ -6561,7 +6561,7 @@ msgid ""
 "       ippfind --version"
 msgstr ""
 
-#: test/ipptool.c:4299
+#: tools/ipptool.c:4306
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -6642,7 +6642,7 @@ msgstr ""
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr ""
 
-#: test/ippeveprinter.c:620
+#: tools/ippeveprinter.c:620
 #, c-format
 msgid "Using spool directory \"%s\"."
 msgstr ""
@@ -7061,21 +7061,22 @@ msgstr ""
 msgid "cups-driverd failed to execute."
 msgstr ""
 
-#: systemv/cupsctl.c:131
-msgid "cupsctl: Cannot set Listen or Port directly."
+#: systemv/cupsctl.c:170
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
 msgstr ""
 
-#: systemv/cupsctl.c:142
+#: systemv/cupsctl.c:183
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/cupsctl.c:185
+#: systemv/cupsctl.c:226
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr ""
 
-#: systemv/cupsctl.c:187
+#: systemv/cupsctl.c:228
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
@@ -7449,19 +7450,19 @@ msgstr ""
 msgid "error-status uses indefinite length"
 msgstr ""
 
-#: test/ippfind.c:2808
+#: tools/ippfind.c:2808
 msgid ""
 "expression --and expression\n"
 "                        Logical AND"
 msgstr ""
 
-#: test/ippfind.c:2810
+#: tools/ippfind.c:2810
 msgid ""
 "expression --or expression\n"
 "                        Logical OR"
 msgstr ""
 
-#: test/ippfind.c:2807
+#: tools/ippfind.c:2807
 msgid "expression expression   Logical AND"
 msgstr ""
 
@@ -8987,157 +8988,158 @@ msgstr ""
 msgid "insert-sheet"
 msgstr ""
 
-#: test/ippeveprinter.c:4634
+#: tools/ippeveprinter.c:4686
 #, c-format
 msgid "ippeveprinter: Unable to open \"%s\": %s on line %d."
 msgstr ""
 
-#: test/ippfind.c:2478
+#: tools/ippfind.c:2478
 #, c-format
 msgid "ippfind: Bad regular expression: %s"
 msgstr ""
 
-#: test/ippfind.c:295
+#: tools/ippfind.c:295
 msgid "ippfind: Cannot use --and after --or."
 msgstr ""
 
-#: test/ippfind.c:580
+#: tools/ippfind.c:580
 #, c-format
 msgid "ippfind: Expected key name after %s."
 msgstr ""
 
-#: test/ippfind.c:530 test/ippfind.c:725
+#: tools/ippfind.c:530 tools/ippfind.c:725
 #, c-format
 msgid "ippfind: Expected port range after %s."
 msgstr ""
 
-#: test/ippfind.c:328
+#: tools/ippfind.c:328
 #, c-format
 msgid "ippfind: Expected program after %s."
 msgstr ""
 
-#: test/ippfind.c:345
+#: tools/ippfind.c:345
 #, c-format
 msgid "ippfind: Expected semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1981
+#: tools/ippfind.c:1981
 msgid "ippfind: Missing close brace in substitution."
 msgstr ""
 
-#: test/ippfind.c:1044
+#: tools/ippfind.c:1044
 msgid "ippfind: Missing close parenthesis."
 msgstr ""
 
-#: test/ippfind.c:302
+#: tools/ippfind.c:302
 msgid "ippfind: Missing expression before \"--and\"."
 msgstr ""
 
-#: test/ippfind.c:427
+#: tools/ippfind.c:427
 msgid "ippfind: Missing expression before \"--or\"."
 msgstr ""
 
-#: test/ippfind.c:862
+#: tools/ippfind.c:862
 #, c-format
 msgid "ippfind: Missing key name after %s."
 msgstr ""
 
-#: test/ippfind.c:396 test/ippfind.c:712
+#: tools/ippfind.c:396 tools/ippfind.c:712
 #, c-format
 msgid "ippfind: Missing name after %s."
 msgstr ""
 
-#: test/ippfind.c:1015
+#: tools/ippfind.c:1015
 msgid "ippfind: Missing open parenthesis."
 msgstr ""
 
-#: test/ippfind.c:892
+#: tools/ippfind.c:892
 #, c-format
 msgid "ippfind: Missing program after %s."
 msgstr ""
 
-#: test/ippfind.c:314 test/ippfind.c:368 test/ippfind.c:409 test/ippfind.c:515
-#: test/ippfind.c:597 test/ippfind.c:612 test/ippfind.c:779 test/ippfind.c:794
-#: test/ippfind.c:817 test/ippfind.c:877
+#: tools/ippfind.c:314 tools/ippfind.c:368 tools/ippfind.c:409
+#: tools/ippfind.c:515 tools/ippfind.c:597 tools/ippfind.c:612
+#: tools/ippfind.c:779 tools/ippfind.c:794 tools/ippfind.c:817
+#: tools/ippfind.c:877
 #, c-format
 msgid "ippfind: Missing regular expression after %s."
 msgstr ""
 
-#: test/ippfind.c:910
+#: tools/ippfind.c:910
 #, c-format
 msgid "ippfind: Missing semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1928 test/ippfind.c:1953
+#: tools/ippfind.c:1928 tools/ippfind.c:1953
 msgid "ippfind: Out of memory."
 msgstr ""
 
-#: test/ippfind.c:988
+#: tools/ippfind.c:988
 msgid "ippfind: Too many parenthesis."
 msgstr ""
 
-#: test/ippfind.c:1287 test/ippfind.c:1415 test/ippfind.c:2570
+#: tools/ippfind.c:1287 tools/ippfind.c:1415 tools/ippfind.c:2570
 #, c-format
 msgid "ippfind: Unable to browse or resolve: %s"
 msgstr ""
 
-#: test/ippfind.c:2051 test/ippfind.c:2078
+#: tools/ippfind.c:2051 tools/ippfind.c:2078
 #, c-format
 msgid "ippfind: Unable to execute \"%s\": %s"
 msgstr ""
 
-#: test/ippfind.c:1134 test/ippfind.c:1142 test/ippfind.c:1153
+#: tools/ippfind.c:1134 tools/ippfind.c:1142 tools/ippfind.c:1153
 #, c-format
 msgid "ippfind: Unable to use Bonjour: %s"
 msgstr ""
 
-#: test/ippfind.c:2010
+#: tools/ippfind.c:2010
 #, c-format
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-#: test/ipptool.c:564 test/ipptool.c:586
+#: tools/ipptool.c:566 tools/ipptool.c:588
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", and \"-X\"."
 msgstr ""
 
-#: test/ipptool.c:349 test/ipptool.c:420
+#: tools/ipptool.c:351 tools/ipptool.c:422
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-#: test/ipptool.c:632
+#: tools/ipptool.c:634
 #, c-format
 msgid "ipptool: Bad URI \"%s\"."
 msgstr ""
 
-#: test/ipptool.c:557
+#: tools/ipptool.c:559
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:621
+#: tools/ipptool.c:623
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:578
+#: tools/ipptool.c:580
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:266
+#: tools/ipptool.c:268
 msgid "ipptool: Missing filename for \"--ippserver\"."
 msgstr ""
 
-#: test/ipptool.c:454
+#: tools/ipptool.c:456
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:435
+#: tools/ipptool.c:437
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:549
+#: tools/ipptool.c:551
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:647
+#: tools/ipptool.c:649
 msgid "ipptool: URI required before test file."
 msgstr ""
 
@@ -19462,39 +19464,39 @@ msgstr ""
 msgid "z-offset"
 msgstr ""
 
-#: test/ippfind.c:2814
+#: tools/ippfind.c:2814
 msgid "{service_domain}        Domain name"
 msgstr ""
 
-#: test/ippfind.c:2815
+#: tools/ippfind.c:2815
 msgid "{service_hostname}      Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2816
+#: tools/ippfind.c:2816
 msgid "{service_name}          Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2817
+#: tools/ippfind.c:2817
 msgid "{service_port}          Port number"
 msgstr ""
 
-#: test/ippfind.c:2818
+#: tools/ippfind.c:2818
 msgid "{service_regtype}       DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2819
+#: tools/ippfind.c:2819
 msgid "{service_scheme}        URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2820
+#: tools/ippfind.c:2820
 msgid "{service_uri}           URI"
 msgstr ""
 
-#: test/ippfind.c:2821
+#: tools/ippfind.c:2821
 msgid "{txt_*}                 Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2813
+#: tools/ippfind.c:2813
 msgid "{}                      URI"
 msgstr ""
 
diff --git a/locale/cups.strings b/locale/cups.strings
index 6dffe35ee..f6cb99800 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -1645,7 +1645,7 @@
 "covering-name.pre-printed" = "Pre-printed";
 "cups-deviced failed to execute." = "cups-deviced failed to execute.";
 "cups-driverd failed to execute." = "cups-driverd failed to execute.";
-"cupsctl: Cannot set Listen or Port directly." = "cupsctl: Cannot set Listen or Port directly.";
+"cupsctl: Cannot set %s directly." = "cupsctl: Cannot set %s directly.";
 "cupsctl: Unable to connect to server: %s" = "cupsctl: Unable to connect to server: %s";
 "cupsctl: Unknown option \"%s\"" = "cupsctl: Unknown option “%s”";
 "cupsctl: Unknown option \"-%c\"" = "cupsctl: Unknown option “-%c”";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 1f970846f..5ac085240 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -5613,8 +5613,9 @@ msgstr "no s'ha pogut executar correctament la cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "no s'ha pogut executar correctament la cups-driverd"
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: no es pot establir Listen o Port directament."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15619,5 +15620,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar les impressores al Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: no es pot establir Listen o Port directament."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: no s'ha pogut obrir el fitxer PPD «%s» - %s"
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 595f3e76f..afd0747fe 100644
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -5412,7 +5412,8 @@ msgstr "Nepodařilo se spustit \"cups-deviced\"."
 msgid "cups-driverd failed to execute."
 msgstr "Nepodařilo se spustit \"cups-driverd\"."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_de.po b/locale/cups_de.po
index eb2bce664..7c2d6b4ca 100644
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -5527,8 +5527,9 @@ msgstr "„cups-deviced“ konnte nicht ausgeführt werden."
 msgid "cups-driverd failed to execute."
 msgstr "„cups-driverd“ konnte nicht ausgeführt werden."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Kann nicht direkt auf dem Port hören."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15492,5 +15493,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Drucker zu Samba exportieren"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Kann nicht direkt auf dem Port hören."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Kann PPD Datei \"%s\" - %s nicht öffnen"
diff --git a/locale/cups_en.po b/locale/cups_en.po
index 07d3f6689..d5a8de822 100644
--- a/locale/cups_en.po
+++ b/locale/cups_en.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
@@ -5691,8 +5691,9 @@ msgstr "cups-deviced failed to execute."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd failed to execute."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15702,5 +15703,8 @@ msgstr "~/.cups/lpoptions file names default destination that does not exist."
 #~ "You must access this page using the URL <A HREF=\"https://%s:%d%s"
 #~ "\">https://%s:%d%s</A>."
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Cannot set Listen or Port directly."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Unable to open PPD file \"%s\" - %s"
diff --git a/locale/cups_es.po b/locale/cups_es.po
index cfc21f42a..7ce2c9508 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -5625,8 +5625,9 @@ msgstr "Ha fallado al ejecutarse cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Ha fallado al ejecutarse cups-driverd."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: No se puede establecer Listen o Port directamente."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15630,5 +15631,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar impresoras a Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: No se puede establecer Listen o Port directamente."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: No se ha podido abrir el archivo PPD \"%s\" - %s"
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index e3e095d66..d18fa8112 100644
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -5430,7 +5430,8 @@ msgstr "L’exécution de « cups-deviced » a échoué."
 msgid "cups-driverd failed to execute."
 msgstr "L’exécution de « cups-driverd » a échoué."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
 msgstr ""
 
 #, c-format
diff --git a/locale/cups_it.po b/locale/cups_it.po
index c9b0fb466..d02177f4e 100644
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Italian - Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -5615,8 +5615,9 @@ msgstr "cups-deviced ha smesso di funzionare."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd ha smesso di funzionare."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: non è possibile impostare direttamente Listen o Port."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15609,5 +15610,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Esporta le stampanti per Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: non è possibile impostare direttamente Listen o Port."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: non è possibile aprile il file PPD \"%s\" - %s"
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 43374d990..8d1b9973c 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: Japanese - OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -5595,8 +5595,9 @@ msgstr "cups-deviced の実行に失敗しました。"
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd の実行に失敗しました。"
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15627,5 +15628,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Samba へプリンターをエクスポート"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: PPD ファイル \"%s\" を開けません - %s"
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index 78ff8d20a..10d8665ea 100644
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
@@ -5621,8 +5621,9 @@ msgstr "cups-deviced falhou na execução."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd falhou na execução."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Não foi possível definir diretamente Porta ou Listen."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15606,5 +15607,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Exportar impressoras para o Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Não foi possível definir diretamente Porta ou Listen."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Não foi possível abrir o arquivo PPD \"%s\" - %s"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 0fa71db2c..b274bc2ab 100644
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: Russian - PuppyRus Linux Team\n"
@@ -5572,8 +5572,9 @@ msgstr "Не удалось выполнить cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Не удалось выполнить cups-driverd."
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl: Не удается задать Listen или Port."
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15556,5 +15557,8 @@ msgstr ""
 #~ msgid "Export Printers to Samba"
 #~ msgstr "Экспортировать принтеры в Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl: Не удается задать Listen или Port."
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin: Не удается открыть PPD-файл \"%s\" - %s"
diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index ece68543c..d555c95bf 100644
--- a/locale/cups_zh_CN.po
+++ b/locale/cups_zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2019-04-24 18:36-0400\n"
+"POT-Creation-Date: 2019-05-15 10:30-0400\n"
 "PO-Revision-Date: 2018-10-09 00:21-0500\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.io>\n"
 "Language-Team: Chinese (Simplified)\n"
@@ -5544,8 +5544,9 @@ msgstr "无法执行 cups-deviced。"
 msgid "cups-driverd failed to execute."
 msgstr "无法执行 cups-driverd。"
 
-msgid "cupsctl: Cannot set Listen or Port directly."
-msgstr "cupsctl：无法直接设置 Listen 或 Port 值。"
+#, c-format
+msgid "cupsctl: Cannot set %s directly."
+msgstr ""
 
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
@@ -15512,5 +15513,8 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "Export Printers to Samba"
 #~ msgstr "将打印机导出到 Samba"
 
+#~ msgid "cupsctl: Cannot set Listen or Port directly."
+#~ msgstr "cupsctl：无法直接设置 Listen 或 Port 值。"
+
 #~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 #~ msgstr "lpadmin：无法打开 PPD 文件“%s”- %s"