Update localization files.

author: Michael R Sweet <michael.r.sweet@gmail.com> 2018-12-06 14:58:20 -0500
committer: Michael R Sweet <michael.r.sweet@gmail.com> 2018-12-06 14:58:20 -0500
commit: 46637f30d7f7cb92ea72e75e4a518dd150138269 (patch)
tree: ec3b39306fb0cace762047d369a8c497ef81a6a6 /locale
parent: f1def5b85f51120f5dc1eb21e1f38860ef41be9c (diff)
download: cups-46637f30d7f7cb92ea72e75e4a518dd150138269.tar.gz
11 files changed, 1272 insertions, 2024 deletions
diff --git a/locale/cups.pot b/locale/cups.pot
index 047a36335..4a7a00ee6 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\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"
@@ -383,14 +383,6 @@ msgid ""
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:270
-msgid "       cupsaddsmb [options] -a"
-msgstr ""
-
-#: systemv/cupstestdsc.c:413
-msgid "       cupstestdsc [options] -"
-msgstr ""
-
 #: systemv/cupstestppd.c:3788
 #, c-format
 msgid ""
@@ -856,103 +848,10 @@ msgstr ""
 msgid "    %d ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:417
-msgid "    -h       Show program usage"
-msgstr ""
-
-#: systemv/cupstestdsc.c:220 systemv/cupstestdsc.c:262
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-
-#: systemv/cupstestdsc.c:291
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-
-#: systemv/cupstestdsc.c:204 systemv/cupstestdsc.c:244
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-
-#: systemv/cupstestdsc.c:162
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-
-#: systemv/cupstestdsc.c:178
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-
-#: systemv/cupstestdsc.c:348
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-
-#: systemv/cupstestdsc.c:328
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-
-#: systemv/cupstestdsc.c:358
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-
-#: systemv/cupstestdsc.c:338
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-
 #: systemv/cupstestppd.c:1477
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:381
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr ""
-
-#: systemv/cupstestdsc.c:376
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr ""
-
-#: systemv/cupstestdsc.c:368
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr ""
-
-#: systemv/cupstestdsc.c:388
-msgid "    Warning: file contains binary data."
-msgstr ""
-
-#: systemv/cupstestdsc.c:396
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr ""
-
-#: systemv/cupstestdsc.c:392
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr ""
-
 #: ppdc/ppdc.cxx:444
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
@@ -977,14 +876,6 @@ msgstr ""
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:273
-msgid "  -E                      Encrypt the connection."
-msgstr ""
-
-#: systemv/cupsaddsmb.c:274
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr ""
-
 #: ppdc/ppdc.cxx:429 ppdc/ppdhtml.cxx:176 ppdc/ppdi.cxx:120 ppdc/ppdpo.cxx:246
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
@@ -993,14 +884,10 @@ msgstr ""
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1480 systemv/cupsaddsmb.c:276
+#: scheduler/cupsfilter.c:1480
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:277
-msgid "  -a                      Export all printers."
-msgstr ""
-
 #: ppdc/ppdc.cxx:431
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
@@ -1021,10 +908,6 @@ msgstr ""
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:278
-msgid "  -h server[:port]        Specify server address."
-msgstr ""
-
 #: scheduler/cupsfilter.c:1484
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
@@ -1077,7 +960,7 @@ msgstr ""
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:279 ppdc/ppdc.cxx:441 ppdc/ppdpo.cxx:248
+#: ppdc/ppdc.cxx:441 ppdc/ppdpo.cxx:248
 msgid "  -v                      Be verbose."
 msgstr ""
 
@@ -1715,9 +1598,9 @@ msgid "%s: Operation failed: %s"
 msgstr ""
 
 #: berkeley/lpq.c:86 berkeley/lpr.c:74 berkeley/lprm.c:71 systemv/cancel.c:85
-#: systemv/cupsaccept.c:95 systemv/cupsaddsmb.c:74 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
+#: 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
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
@@ -1728,7 +1611,6 @@ msgid "%s: Unable to connect to \"%s:%d\": %s"
 msgstr ""
 
 #: berkeley/lpq.c:292 scheduler/cupsfilter.c:1269 systemv/cancel.c:250
-#: systemv/cupsaddsmb.c:132 systemv/cupsaddsmb.c:159
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr ""
@@ -3778,11 +3660,6 @@ msgstr ""
 msgid "Bad number-up value %d."
 msgstr ""
 
-#: cups/adminutil.c:274
-#, c-format
-msgid "Bad option + choice on line %d."
-msgstr ""
-
 #: scheduler/ipp.c:1442
 #, c-format
 msgid "Bad page-ranges values %d-%d."
@@ -4107,10 +3984,6 @@ msgstr ""
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/adminutil.c:319
-msgid "Empty PPD file."
-msgstr ""
-
 #: cups/http.c:4633
 msgid "Encryption is not supported."
 msgstr ""
@@ -4429,16 +4302,6 @@ msgstr ""
 msgid "Expressions:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:158 systemv/cupstestdsc.c:175
-#: systemv/cupstestdsc.c:200 systemv/cupstestdsc.c:217
-#: systemv/cupstestdsc.c:241 systemv/cupstestdsc.c:259
-#: systemv/cupstestdsc.c:288 systemv/cupstestdsc.c:325
-#: systemv/cupstestdsc.c:335 systemv/cupstestdsc.c:345
-#: systemv/cupstestdsc.c:355 systemv/cupstestdsc.c:365
-#: systemv/cupstestdsc.c:373
-msgid "FAIL"
-msgstr ""
-
 #: cups/ppd-cache.c:3764
 msgid "Fast Grayscale"
 msgstr ""
@@ -5012,11 +4875,6 @@ msgstr ""
 msgid "Missing document-number attribute."
 msgstr ""
 
-#: cups/adminutil.c:255
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr ""
-
 #: cgi-bin/admin.c:505 cgi-bin/admin.c:1801 cgi-bin/admin.c:1886
 #: cgi-bin/admin.c:2480 cgi-bin/admin.c:2734 cgi-bin/admin.c:2845
 #: cgi-bin/admin.c:3555
@@ -5064,11 +4922,6 @@ msgstr ""
 msgid "Missing scheme in URI"
 msgstr ""
 
-#: cups/adminutil.c:236
-#, c-format
-msgid "Missing value on line %d."
-msgstr ""
-
 #: cups/ppd.c:307
 msgid "Missing value string"
 msgstr ""
@@ -5158,10 +5011,6 @@ msgstr ""
 msgid "No VarBind SEQUENCE"
 msgstr ""
 
-#: cups/adminutil.c:770
-msgid "No Windows printer drivers are installed."
-msgstr ""
-
 #: cups/request.c:548 cups/request.c:920
 msgid "No active connection"
 msgstr ""
@@ -5330,10 +5179,6 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: systemv/cupstestdsc.c:419
-msgid "Note: this program only validates the DSC comments, not the PostScript itself."
-msgstr ""
-
 #: cups/http-support.c:1488 cups/http-support.c:1627 cups/ppd.c:302
 msgid "OK"
 msgstr ""
@@ -5354,7 +5199,7 @@ msgstr ""
 msgid "Only local users can create a local printer."
 msgstr ""
 
-#: cups/adminutil.c:937
+#: cups/adminutil.c:197
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr ""
@@ -5382,12 +5227,12 @@ msgstr ""
 
 #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232
 #: scheduler/cupsfilter.c:1476 scheduler/main.c:2135 systemv/cancel.c:401
-#: systemv/cupsaccept.c:243 systemv/cupsaddsmb.c:272 systemv/cupsctl.c:191
-#: systemv/cupstestdsc.c:415 systemv/cupstestppd.c:3857 systemv/lp.c:750
-#: systemv/lpadmin.c:1630 systemv/lpinfo.c:497 systemv/lpmove.c:216
-#: systemv/lpoptions.c:538 systemv/lpstat.c:2044 test/ippfind.c:2768
-#: test/ipptool.c:4300 ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173
-#: ppdc/ppdi.cxx:119 ppdc/ppdmerge.cxx:357 ppdc/ppdpo.cxx:243
+#: systemv/cupsaccept.c:243 systemv/cupsctl.c:191 systemv/cupstestppd.c:3857
+#: systemv/lp.c:750 systemv/lpadmin.c:1630 systemv/lpinfo.c:497
+#: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044
+#: test/ippfind.c:2768 test/ipptool.c:4300 ppdc/ppdc.cxx:426
+#: ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119 ppdc/ppdmerge.cxx:357
+#: ppdc/ppdpo.cxx:243
 msgid "Options:"
 msgstr ""
 
@@ -5411,10 +5256,6 @@ msgstr ""
 msgid "Output Mode"
 msgstr ""
 
-#: systemv/cupstestdsc.c:385
-msgid "PASS"
-msgstr ""
-
 #: ppdc/sample.c:252
 msgid "PCL Laser Printer"
 msgstr ""
@@ -5468,11 +5309,6 @@ msgstr ""
 msgid "Password for %s on %s? "
 msgstr ""
 
-#: systemv/cupsaddsmb.c:240
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr ""
-
 #: cgi-bin/classes.c:153
 msgid "Pause Class"
 msgstr ""
@@ -5698,7 +5534,7 @@ msgstr ""
 msgid "Rewind"
 msgstr ""
 
-#: cups/adminutil.c:2094
+#: cups/adminutil.c:1354
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr ""
@@ -6166,7 +6002,7 @@ msgstr ""
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:893 cups/request.c:1057
+#: cups/adminutil.c:153 cups/request.c:1057
 msgid "Unable to connect to host."
 msgstr ""
 
@@ -6175,21 +6011,6 @@ msgstr ""
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: cups/adminutil.c:708
-#, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-
-#: cups/adminutil.c:673
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-
-#: cups/adminutil.c:504
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr ""
-
 #: scheduler/ipp.c:2688
 #, c-format
 msgid "Unable to copy PPD file - %s"
@@ -6199,16 +6020,6 @@ msgstr ""
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/adminutil.c:469
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#: cups/adminutil.c:592
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-
 #: cups/tls-darwin.c:655 cups/tls-gnutls.c:442
 msgid "Unable to create credentials from array."
 msgstr ""
@@ -6321,16 +6132,6 @@ msgstr ""
 msgid "Unable to get printer status."
 msgstr ""
 
-#: cups/adminutil.c:547 cups/adminutil.c:751
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#: cups/adminutil.c:621
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-
 #: cgi-bin/help.c:82
 msgid "Unable to load help index."
 msgstr ""
@@ -6410,7 +6211,7 @@ msgstr ""
 msgid "Unable to resolve printer-uri."
 msgstr ""
 
-#: cups/adminutil.c:2130
+#: cups/adminutil.c:1390
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr ""
@@ -6427,11 +6228,6 @@ msgstr ""
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: cups/adminutil.c:803
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr ""
-
 #: cgi-bin/admin.c:3502
 msgid "Unable to set options"
 msgstr ""
@@ -6658,10 +6454,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-#: systemv/cupsaddsmb.c:269
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr ""
-
 #: systemv/cupsctl.c:190
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
@@ -6674,10 +6466,6 @@ msgstr ""
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-#: systemv/cupstestdsc.c:411
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr ""
-
 #: systemv/cupstestppd.c:3855
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
@@ -6797,10 +6585,6 @@ msgstr ""
 msgid "Waiting for printer to finish."
 msgstr ""
 
-#: cups/adminutil.c:775
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr ""
-
 #: systemv/cupstestppd.c:3854
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
@@ -6846,11 +6630,6 @@ msgstr ""
 msgid "cups-driverd failed to execute."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:221
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr ""
-
 #: systemv/cupsctl.c:131
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
@@ -7927,7 +7706,7 @@ msgstr ""
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:2201
+#: cups/adminutil.c:1461
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr ""
diff --git a/locale/cups.strings b/locale/cups.strings
index 4012ef575..fd8d323b4 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -75,8 +75,6 @@
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n                REF: Pages 78-79, section 5.7." = "        WARN    Protocols contains PJL but JCL attributes are not set.\n                REF: Pages 78-79, section 5.7.";
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n                REF: Pages 78-79, section 5.7." = "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n                REF: Pages 78-79, section 5.7.";
 "        WARN    ShortNickName required by PPD 4.3 spec.\n                REF: Pages 64-65, section 5.3." = "        WARN    ShortNickName required by PPD 4.3 spec.\n                REF: Pages 64-65, section 5.3.";
-"       cupsaddsmb [options] -a" = "       cupsaddsmb [options] -a";
-"       cupstestdsc [options] -" = "       cupstestdsc [options] -";
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n                (constraint=\"%s %s %s %s\")." = "      %s  “%s %s” conflicts with “%s %s”\n                (constraint=“%s %s %s %s”).";
 "      %s  %s %s does not exist." = "      %s  %s %s does not exist.";
 "      %s  %s file \"%s\" has the wrong capitalization." = "      %s  %s file “%s” has the wrong capitalization.";
@@ -156,41 +154,21 @@
 "      **FAIL**  REQUIRED ShortNickName\n                REF: Page 64-65, section 5.3." = "      **FAIL**  REQUIRED ShortNickName\n                REF: Page 64-65, section 5.3.";
 "      **FAIL**  Unable to open PPD file - %s on line %d." = "      **FAIL**  Unable to open PPD file - %s on line %d.";
 "    %d ERRORS FOUND" = "    %d ERRORS FOUND";
-"    -h       Show program usage" = "    -h       Show program usage";
-"    Bad %%%%BoundingBox: on line %d.\n        REF: Page 39, %%%%BoundingBox:" = "    Bad %%%%BoundingBox: on line %d.\n        REF: Page 39, %%%%BoundingBox:";
-"    Bad %%%%Page: on line %d.\n        REF: Page 53, %%%%Page:" = "    Bad %%%%Page: on line %d.\n        REF: Page 53, %%%%Page:";
-"    Bad %%%%Pages: on line %d.\n        REF: Page 43, %%%%Pages:" = "    Bad %%%%Pages: on line %d.\n        REF: Page 43, %%%%Pages:";
-"    Line %d is longer than 255 characters (%d).\n        REF: Page 25, Line Length" = "    Line %d is longer than 255 characters (%d).\n        REF: Page 25, Line Length";
-"    Missing %!PS-Adobe-3.0 on first line.\n        REF: Page 17, 3.1 Conforming Documents" = "    Missing %!PS-Adobe-3.0 on first line.\n        REF: Page 17, 3.1 Conforming Documents";
-"    Missing %%EndComments comment.        REF: Page 41, %%EndComments" = "    Missing %%EndComments comment.        REF: Page 41, %%EndComments";
-"    Missing or bad %%BoundingBox: comment.\n        REF: Page 39, %%BoundingBox:" = "    Missing or bad %%BoundingBox: comment.\n        REF: Page 39, %%BoundingBox:";
-"    Missing or bad %%Page: comments.\n        REF: Page 53, %%Page:" = "    Missing or bad %%Page: comments.\n        REF: Page 53, %%Page:";
-"    Missing or bad %%Pages: comment.\n        REF: Page 43, %%Pages:" = "    Missing or bad %%Pages: comment.\n        REF: Page 43, %%Pages:";
 "    NO ERRORS FOUND" = "    NO ERRORS FOUND";
-"    Saw %d lines that exceeded 255 characters." = "    Saw %d lines that exceeded 255 characters.";
-"    Too many %%BeginDocument comments." = "    Too many %%BeginDocument comments.";
-"    Too many %%EndDocument comments." = "    Too many %%EndDocument comments.";
-"    Warning: file contains binary data." = "    Warning: file contains binary data.";
-"    Warning: no %%EndComments comment in file." = "    Warning: no %%EndComments comment in file.";
-"    Warning: obsolete DSC version %.1f in file." = "    Warning: obsolete DSC version %.1f in file.";
 "  --cr                    End lines with CR (Mac OS 9)." = "  --cr                    End lines with CR (Mac OS 9).";
 "  --crlf                  End lines with CR + LF (Windows)." = "  --crlf                  End lines with CR + LF (Windows).";
 "  --lf                    End lines with LF (UNIX/Linux/macOS)." = "  --lf                    End lines with LF (UNIX/Linux/macOS).";
 "  --list-filters          List filters that will be used." = "  --list-filters          List filters that will be used.";
 "  -D                      Remove the input file when finished." = "  -D                      Remove the input file when finished.";
 "  -D name=value           Set named variable to value." = "  -D name=value           Set named variable to value.";
-"  -E                      Encrypt the connection." = "  -E                      Encrypt the connection.";
-"  -H samba-server         Use the named SAMBA server." = "  -H samba-server         Use the named SAMBA server.";
 "  -I include-dir          Add include directory to search path." = "  -I include-dir          Add include directory to search path.";
 "  -P filename.ppd         Set PPD file." = "  -P filename.ppd         Set PPD file.";
 "  -U username             Specify username." = "  -U username             Specify username.";
-"  -a                      Export all printers." = "  -a                      Export all printers.";
 "  -c catalog.po           Load the specified message catalog." = "  -c catalog.po           Load the specified message catalog.";
 "  -c cups-files.conf      Set cups-files.conf file to use." = "  -c cups-files.conf      Set cups-files.conf file to use.";
 "  -d output-dir           Specify the output directory." = "  -d output-dir           Specify the output directory.";
 "  -d printer              Use the named printer." = "  -d printer              Use the named printer.";
 "  -e                      Use every filter from the PPD file." = "  -e                      Use every filter from the PPD file.";
-"  -h server[:port]        Specify server address." = "  -h server[:port]        Specify server address.";
 "  -i mime/type            Set input MIME type (otherwise auto-typed)." = "  -i mime/type            Set input MIME type (otherwise auto-typed).";
 "  -j job-id[,N]           Filter file N from the specified job (default is file 1)." = "  -j job-id[,N]           Filter file N from the specified job (default is file 1).";
 "  -l lang[,lang,...]      Specify the output language(s) (locale)." = "  -l lang[,lang,…]      Specify the output language(s) (locale).";
@@ -811,7 +789,6 @@
 "Bad notify-recipient-uri \"%s\"." = "Bad notify-recipient-uri “%s”.";
 "Bad notify-user-data \"%s\"." = "Bad notify-user-data “%s”.";
 "Bad number-up value %d." = "Bad number-up value %d.";
-"Bad option + choice on line %d." = "Bad option + choice on line %d.";
 "Bad page-ranges values %d-%d." = "Bad page-ranges values %d-%d.";
 "Bad port number in URI" = "Bad port number in URI";
 "Bad port-monitor \"%s\"." = "Bad port-monitor “%s”.";
@@ -886,7 +863,6 @@
 "EPL1 Label Printer" = "EPL1 Label Printer";
 "EPL2 Label Printer" = "EPL2 Label Printer";
 "Edit Configuration File" = "Edit Configuration File";
-"Empty PPD file." = "Empty PPD file.";
 "Encryption is not supported." = "Encryption is not supported.";
 // TRANSLATORS: Banner/cover sheet after the print job.
 "Ending Banner" = "Ending Banner";
@@ -967,7 +943,6 @@
 "Expectation Failed" = "Expectation Failed";
 "Export Printers to Samba" = "Export Printers to Samba";
 "Expressions:" = "Expressions:";
-"FAIL" = "FAIL";
 "Fast Grayscale" = "Fast Grayscale";
 "File \"%s\" contains a relative path." = "File “%s” contains a relative path.";
 "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)." = "File “%s” has insecure permissions (0%o/uid=%d/gid=%d).";
@@ -1104,7 +1079,6 @@
 "Missing PPD-Adobe-4.x header" = "Missing PPD-Adobe-4.x header";
 "Missing asterisk in column 1" = "Missing asterisk in column 1";
 "Missing document-number attribute." = "Missing document-number attribute.";
-"Missing double quote on line %d." = "Missing double quote on line %d.";
 "Missing form variable" = "Missing form variable";
 "Missing last-document attribute in request." = "Missing last-document attribute in request.";
 "Missing media or media-col." = "Missing media or media-col.";
@@ -1116,7 +1090,6 @@
 "Missing required attributes." = "Missing required attributes.";
 "Missing resource in URI" = "Missing resource in URI";
 "Missing scheme in URI" = "Missing scheme in URI";
-"Missing value on line %d." = "Missing value on line %d.";
 "Missing value string" = "Missing value string";
 "Missing x-dimension in media-size." = "Missing x-dimension in media-size.";
 "Missing y-dimension in media-size." = "Missing y-dimension in media-size.";
@@ -1138,7 +1111,6 @@
 "No IPP attributes." = "No IPP attributes.";
 "No PPD name" = "No PPD name";
 "No VarBind SEQUENCE" = "No VarBind SEQUENCE";
-"No Windows printer drivers are installed." = "No Windows printer drivers are installed.";
 "No active connection" = "No active connection";
 "No active connection." = "No active connection.";
 "No active jobs on %s." = "No active jobs on %s.";
@@ -1180,7 +1152,6 @@
 "Not Supported" = "Not Supported";
 "Not allowed to print." = "Not allowed to print.";
 "Note" = "Note";
-"Note: this program only validates the DSC comments, not the PostScript itself." = "Note: this program only validates the DSC comments, not the PostScript itself.";
 "OK" = "OK";
 "Off (1-Sided)" = "Off (1-Sided)";
 "Oki" = "Oki";
@@ -1198,7 +1169,6 @@
 "Out of date PPD cache file." = "Out of date PPD cache file.";
 "Out of memory." = "Out of memory.";
 "Output Mode" = "Output Mode";
-"PASS" = "PASS";
 "PCL Laser Printer" = "PCL Laser Printer";
 "PRC16K" = "PRC16K";
 "PRC16K Long Edge" = "PRC16K Long Edge";
@@ -1212,7 +1182,6 @@
 "ParamCustominCutInterval" = "ParamCustominCutInterval";
 "ParamCustominTearInterval" = "ParamCustominTearInterval";
 "Password for %s on %s? " = "Password for %s on %s? ";
-"Password for %s required to access %s via SAMBA: " = "Password for %s required to access %s via SAMBA: ";
 "Pause Class" = "Pause Class";
 "Pause Printer" = "Pause Printer";
 "Peel-Off" = "Peel-Off";
@@ -1379,13 +1348,8 @@
 "Unable to configure printer options." = "Unable to configure printer options.";
 "Unable to connect to host." = "Unable to connect to host.";
 "Unable to contact printer, queuing on next printer in class." = "Unable to contact printer, queuing on next printer in class.";
-"Unable to copy 64-bit CUPS printer driver files (%d)." = "Unable to copy 64-bit CUPS printer driver files (%d).";
-"Unable to copy 64-bit Windows printer driver files (%d)." = "Unable to copy 64-bit Windows printer driver files (%d).";
-"Unable to copy CUPS printer driver files (%d)." = "Unable to copy CUPS printer driver files (%d).";
 "Unable to copy PPD file - %s" = "Unable to copy PPD file - %s";
 "Unable to copy PPD file." = "Unable to copy PPD file.";
-"Unable to copy Windows 2000 printer driver files (%d)." = "Unable to copy Windows 2000 printer driver files (%d).";
-"Unable to copy Windows 9x printer driver files (%d)." = "Unable to copy Windows 9x printer driver files (%d).";
 "Unable to create credentials from array." = "Unable to create credentials from array.";
 "Unable to create printer-uri" = "Unable to create printer-uri";
 "Unable to create printer." = "Unable to create printer.";
@@ -1414,8 +1378,6 @@
 "Unable to get printer list" = "Unable to get printer list";
 "Unable to get printer status" = "Unable to get printer status";
 "Unable to get printer status." = "Unable to get printer status.";
-"Unable to install Windows 2000 printer driver files (%d)." = "Unable to install Windows 2000 printer driver files (%d).";
-"Unable to install Windows 9x printer driver files (%d)." = "Unable to install Windows 9x printer driver files (%d).";
 "Unable to load help index." = "Unable to load help index.";
 "Unable to locate printer \"%s\"." = "Unable to locate printer “%s”.";
 "Unable to locate printer." = "Unable to locate printer.";
@@ -1438,7 +1400,6 @@
 "Unable to see in file" = "Unable to see in file";
 "Unable to send command to printer driver" = "Unable to send command to printer driver";
 "Unable to send data to printer." = "Unable to send data to printer.";
-"Unable to set Windows printer driver (%d)." = "Unable to set Windows printer driver (%d).";
 "Unable to set options" = "Unable to set options";
 "Unable to set server default" = "Unable to set server default";
 "Unable to start backend process." = "Unable to start backend process.";
@@ -1486,11 +1447,9 @@
 "Usage: %s [options] destination(s)" = "Usage: %s [options] destination(s)";
 "Usage: %s job-id user title copies options [file]" = "Usage: %s job-id user title copies options [file]";
 "Usage: cancel [options] [id]\n       cancel [options] [destination]\n       cancel [options] [destination-id]" = "Usage: cancel [options] [id]\n       cancel [options] [destination]\n       cancel [options] [destination-id]";
-"Usage: cupsaddsmb [options] printer1 ... printerN" = "Usage: cupsaddsmb [options] printer1 … printerN";
 "Usage: cupsctl [options] [param=value ... paramN=valueN]" = "Usage: cupsctl [options] [param=value … paramN=valueN]";
 "Usage: cupsd [options]" = "Usage: cupsd [options]";
 "Usage: cupsfilter [ options ] [ -- ] filename" = "Usage: cupsfilter [ options ] [ -- ] filename";
-"Usage: cupstestdsc [options] filename.ps [... filename.ps]" = "Usage: cupstestdsc [options] filename.ps [… filename.ps]";
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n       program | cupstestppd [options] -" = "Usage: cupstestppd [options] filename1.ppd[.gz] [… filenameN.ppd[.gz]]\n       program | cupstestppd [options] -";
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n       ippfind [options] name[.regtype[.domain.]] ... [expression]\n       ippfind --help\n       ippfind --version" = "Usage: ippfind [options] regtype[,subtype][.domain.] … [expression]\n       ippfind [options] name[.regtype[.domain.]] … [expression]\n       ippfind --help\n       ippfind --version";
 "Usage: ipptool [options] URI filename [ ... filenameN ]" = "Usage: ipptool [options] URI filename [ … filenameN ]";
@@ -1515,7 +1474,6 @@
 "Waiting for job to complete." = "Waiting for job to complete.";
 "Waiting for printer to become available." = "Waiting for printer to become available.";
 "Waiting for printer to finish." = "Waiting for printer to finish.";
-"Warning, no Windows 2000 printer drivers are installed." = "Warning, no Windows 2000 printer drivers are installed.";
 "Warning: This program will be removed in a future version of CUPS." = "Warning: This program will be removed in a future version of CUPS.";
 "Web Interface is Disabled" = "Web Interface is Disabled";
 "Yes" = "Yes";
@@ -1527,7 +1485,6 @@
 "completed" = "completed";
 "cups-deviced failed to execute." = "cups-deviced failed to execute.";
 "cups-driverd failed to execute." = "cups-driverd failed to execute.";
-"cupsaddsmb: No PPD file for printer \"%s\" - %s" = "cupsaddsmb: No PPD file for printer “%s” - %s";
 "cupsctl: Cannot set Listen or Port directly." = "cupsctl: Cannot set Listen or Port directly.";
 "cupsctl: Unable to connect to server: %s" = "cupsctl: Unable to connect to server: %s";
 "cupsctl: Unknown option \"%s\"" = "cupsctl: Unknown option “%s”";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 62a6b74cc..19e695cb4 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\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"
@@ -328,12 +328,6 @@ msgstr ""
 "        AVÍS    Es requereix un ShortNickName segons les espec.del PPD 4.3.\n"
 "                REF: pàgines 64-65, secció 5.3."
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "       cupsaddsmb [opcions] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "       cupstestdsc [opcions] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -803,103 +797,9 @@ msgstr "      **ERROR** No es pot obrir el fitxer PPD - %s a la línia %d."
 msgid "    %d ERRORS FOUND"
 msgstr "    %d S'HAN TROBAT ERRORS"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Mostra la sintaxi del programa"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    %%%%BoundingBox incorrecte: a la línia %d.\n"
-"        REF: pàgina 39, %%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    %%%%Page incorrecte: a la línia %d.\n"
-"        REF: pàgina 53, %%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    %%%%Pages incorrecte: a la línia %d!\n"
-"        REF: pàgina 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    La línia %d és més llarga de 255 caràcters (%d)\n"
-"        REF: pàgina 25, Longitud de línia"
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    Falta %!PS-Adobe-3.0 a la primera línia.\n"
-"        REF: pàgina 17, 3.1 Adaptació de documents"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-"    Falta el comentari %%EndComments.        REF: pàgina 41, %%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"     %%BoundingBox incorrecte o inexistent: comentari.\n"
-"        REF: pàgina 39, %%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    %%Page incorrecte o inexistent: comentaris.\n"
-"        REF: pàgina 53, %%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    %%Pages incorrecte o inexistent: comentari.\n"
-"        REF: pàgina 43, %%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    NO S'HA TROBAT CAP ERROR"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "     S'han trobat %d línies que superen els 255 caràcters."
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "     Massa comentaris %%BeginDocument."
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "     Massa comentaris %%EndDocument."
-
-msgid "    Warning: file contains binary data."
-msgstr "     Avís: el fitxer conté dades binàries."
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "     Avís: no hi ha cap %%EndComments al fitxer."
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "     Avís: versió del DSC %.1f obsoleta al fitxer."
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Final de línia amb CR (Mac OS 9)."
 
@@ -918,12 +818,6 @@ msgstr "  -D                      Elimina el fitxer d'entrada quan ha acabat."
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nom=valor            Estableix la variable indicada al valor."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Xifra la connexió."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H servidor-samba         Fa servir el servidor SAMBA indicat."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr "  -I dir-inclòs          Afegeix el directori inclòs al camí de cerca."
 
@@ -933,9 +827,6 @@ msgstr "  -P nomfitxer.ppd         Estableix el fitxer PPD."
 msgid "  -U username             Specify username."
 msgstr "  -U nomusuari             Especifica un nom d'usuari."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Exporta totes les impressores."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catàleg.po           Carrega el catàleg de missatges indicat."
 
@@ -951,9 +842,6 @@ msgstr "  -d impressora              Fa servir la impressora indicada."
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Fa servir tots els filtres del fitxer PPD."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h servidor[:port]        Especifica l'adreça del servidor."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i tipus/mime            Estableix el tipus MIME d'entrada (auto-typed si "
@@ -3087,10 +2975,6 @@ msgid "Bad number-up value %d."
 msgstr "El valor de number-up %d és incorrecte."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "L'opció + elecció de la línia %d és incorrecta."
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Els valors de page-ranges %d-%d són incorrectes."
 
@@ -3345,9 +3229,6 @@ msgstr "Impressora d'etiquetes EPL2"
 msgid "Edit Configuration File"
 msgstr "Edita el fitxer de configuració"
 
-msgid "Empty PPD file."
-msgstr "El fitxer PPD és buit."
-
 msgid "Encryption is not supported."
 msgstr ""
 
@@ -3593,9 +3474,6 @@ msgstr "Exportar les impressores al Samba"
 msgid "Expressions:"
 msgstr ""
 
-msgid "FAIL"
-msgstr "ERROR"
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4030,10 +3908,6 @@ msgstr "Falta un asterisc a la columna 1"
 msgid "Missing document-number attribute."
 msgstr "Falta l'atribut document-number."
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "Falta una cometa doble a la línia %d."
-
 msgid "Missing form variable"
 msgstr "Falta una variable del formulari"
 
@@ -4068,10 +3942,6 @@ msgstr ""
 msgid "Missing scheme in URI"
 msgstr ""
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "Falta un valor a la línia %d."
-
 msgid "Missing value string"
 msgstr "Falta la cadena de valor"
 
@@ -4144,9 +4014,6 @@ msgstr "El PPD no té nom"
 msgid "No VarBind SEQUENCE"
 msgstr "No hi ha cap SEQUENCE VarBind"
 
-msgid "No Windows printer drivers are installed."
-msgstr "No hi ha cap controlador d'impressores de Windows instal·lat."
-
 msgid "No active connection"
 msgstr "No hi ha cap connexió activa"
 
@@ -4273,12 +4140,6 @@ msgstr "No teniu permís per imprimir."
 msgid "Note"
 msgstr "Nota"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"Nota: aquest programa només valida els comentaris DSC, no el PostScript."
-
 msgid "OK"
 msgstr "D'acord"
 
@@ -4332,9 +4193,6 @@ msgstr "Sense memòria."
 msgid "Output Mode"
 msgstr "Mode de sortida"
 
-msgid "PASS"
-msgstr "VÀLID"
-
 msgid "PCL Laser Printer"
 msgstr "Impressora làser PCL"
 
@@ -4376,10 +4234,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Contrasenya per %s a %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Es necessita la contrasenya de %s per accedir a %s a través de SAMBA: "
-
 msgid "Pause Class"
 msgstr "Posa la classe en pausa"
 
@@ -4927,39 +4781,12 @@ msgstr ""
 "impressora de la classe."
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-"No es poden copiar els fitxers del controlador d'impressora CUPS de 64 bits "
-"(%d)."
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-"No es poden copiar els fitxers del controlador d'impressora Windows de 64 "
-"bits (%d)."
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "No es poden copiar els fitxers del controlador d'impressora CUPS (%d)."
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "No es pot copiar el fitxer PPD - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "No es pot copiar el fitxer PPD."
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-"No es poden copiar els fitxers del controlador d'impressora Windows 2000 "
-"(%d)."
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-"No es poden copiar els fitxers del controlador d'impressora Windows 9x (%d)."
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5064,18 +4891,6 @@ msgstr "No es pot obtenir l'estat de la impressora"
 msgid "Unable to get printer status."
 msgstr "No es pot obtenir l'estat de la impressora."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-"No es poden instal·lar els fitxers del controlador d'impressores per Windows "
-"2000 (%d)."
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-"No es poden instal·lar els fitxers del controlador d'impressores per Windows "
-"9x (%d)."
-
 msgid "Unable to load help index."
 msgstr "No es pot carregar l'índex de l'ajuda."
 
@@ -5145,10 +4960,6 @@ msgstr "No es pot enviar la comanda al controlador de la impressora"
 msgid "Unable to send data to printer."
 msgstr "No es poden enviar dades a la impressora."
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "No es pot configurar el controlador d'impressores per Windows (%d)"
-
 msgid "Unable to set options"
 msgstr "No es poden configurar les opcions"
 
@@ -5335,9 +5146,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "Sintaxi: cupsaddsmb [opcions] impressora1 ... impressoraN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Sintaxi: cupsctl [opcions] [param=valor ... paramN=valorN]"
 
@@ -5347,9 +5155,6 @@ msgstr "Sintaxi: cupsd [opcions]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "Sintaxi: cupstestdsc [opcions] nomfitxer.ps [...nomfitxer.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5447,9 +5252,6 @@ msgstr "S'està esperant que la impressora estigui disponible."
 msgid "Waiting for printer to finish."
 msgstr "S'està esperant que la impressora acabi."
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "AVÍS. No hi ha cap controlador per Windows 2000 instal·lat."
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5689,10 +5491,6 @@ 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"
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: falta el fitxer PPD per la impressora «%s» - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: no es pot establir Listen o Port directament."
 
@@ -12906,9 +12704,97 @@ msgstr ""
 #~ msgid "                          Issue warnings instead of errors."
 #~ msgstr "                          Mostra avisos enlloc d'errors."
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "       cupsaddsmb [opcions] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "       cupstestdsc [opcions] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "       programa | cupstestppd [opcions] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Mostra la sintaxi del programa"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    %%%%BoundingBox incorrecte: a la línia %d.\n"
+#~ "        REF: pàgina 39, %%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    %%%%Page incorrecte: a la línia %d.\n"
+#~ "        REF: pàgina 53, %%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    %%%%Pages incorrecte: a la línia %d!\n"
+#~ "        REF: pàgina 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    La línia %d és més llarga de 255 caràcters (%d)\n"
+#~ "        REF: pàgina 25, Longitud de línia"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    Falta %!PS-Adobe-3.0 a la primera línia.\n"
+#~ "        REF: pàgina 17, 3.1 Adaptació de documents"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr ""
+#~ "    Falta el comentari %%EndComments.        REF: pàgina 41, %%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "     %%BoundingBox incorrecte o inexistent: comentari.\n"
+#~ "        REF: pàgina 39, %%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    %%Page incorrecte o inexistent: comentaris.\n"
+#~ "        REF: pàgina 53, %%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    %%Pages incorrecte o inexistent: comentari.\n"
+#~ "        REF: pàgina 43, %%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "     S'han trobat %d línies que superen els 255 caràcters."
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "     Massa comentaris %%BeginDocument."
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "     Massa comentaris %%EndDocument."
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "     Avís: el fitxer conté dades binàries."
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "     Avís: no hi ha cap %%EndComments al fitxer."
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "     Avís: versió del DSC %.1f obsoleta al fitxer."
+
 #~ msgid "  --[no-]debug-logging    Turn debug logging on/off."
 #~ msgstr ""
 #~ "  --[no-]debug-logging    Activa o desactiva el registre de depuració."
@@ -12940,12 +12826,18 @@ msgstr ""
 #~ "  -C                      Envia les sol·licituds fent servir la "
 #~ "fragmentació (per defecte)."
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Xifra la connexió."
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      Executa en primer pla però separat de la "
 #~ "consola."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H servidor-samba         Fa servir el servidor SAMBA indicat."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Ignora els errors."
 
@@ -12978,6 +12870,9 @@ msgstr ""
 #~ msgstr ""
 #~ "  -X                      Retorna els plist en XML en comptes de text pla."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Exporta totes les impressores."
+
 #~ msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 #~ msgstr ""
 #~ "  -c cupsd.conf           Estableix el fitxer cupsd.conf que cal fer "
@@ -12997,6 +12892,9 @@ msgstr ""
 #~ msgid "  -h                      Show this usage message."
 #~ msgstr "  -h                      Mostra aquest missatge de sintaxi."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h servidor[:port]        Especifica l'adreça del servidor."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13025,6 +12923,80 @@ msgstr ""
 #~ msgid "  -vv                     Be very verbose."
 #~ msgstr "  -vv                     Mode molt detallat."
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "L'opció + elecció de la línia %d és incorrecta."
+
+#~ msgid "Empty PPD file."
+#~ msgstr "El fitxer PPD és buit."
+
+#~ msgid "FAIL"
+#~ msgstr "ERROR"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "Falta una cometa doble a la línia %d."
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "Falta un valor a la línia %d."
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "No hi ha cap controlador d'impressores de Windows instal·lat."
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "Nota: aquest programa només valida els comentaris DSC, no el PostScript."
+
+#~ msgid "PASS"
+#~ msgstr "VÀLID"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr ""
+#~ "Es necessita la contrasenya de %s per accedir a %s a través de SAMBA: "
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden copiar els fitxers del controlador d'impressora CUPS de 64 "
+#~ "bits (%d)."
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden copiar els fitxers del controlador d'impressora Windows de 64 "
+#~ "bits (%d)."
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden copiar els fitxers del controlador d'impressora CUPS (%d)."
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden copiar els fitxers del controlador d'impressora Windows 2000 "
+#~ "(%d)."
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden copiar els fitxers del controlador d'impressora Windows 9x "
+#~ "(%d)."
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden instal·lar els fitxers del controlador d'impressores per "
+#~ "Windows 2000 (%d)."
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "No es poden instal·lar els fitxers del controlador d'impressores per "
+#~ "Windows 9x (%d)."
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "No es pot configurar el controlador d'impressores per Windows (%d)"
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "Sintaxi: cupsaddsmb [opcions] impressora1 ... impressoraN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr "Sintaxi: cupstestdsc [opcions] nomfitxer.ps [...nomfitxer.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr ""
@@ -13050,3 +13022,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Sintaxi: lpq [-P destí] [-U nomusuari] [-h nomamfitrió[:port]] [-l] "
 #~ "[+interval]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr "AVÍS. No hi ha cap controlador per Windows 2000 instal·lat."
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: falta el fitxer PPD per la impressora «%s» - %s"
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 6e15eeb78..c3c729e63 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -293,12 +293,6 @@ msgid ""
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-msgid "       cupsaddsmb [options] -a"
-msgstr ""
-
-msgid "       cupstestdsc [options] -"
-msgstr ""
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -677,86 +671,9 @@ msgstr ""
 msgid "    %d ERRORS FOUND"
 msgstr ""
 
-msgid "    -h       Show program usage"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr ""
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr ""
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr ""
-
-msgid "    Warning: file contains binary data."
-msgstr ""
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr ""
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr ""
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
@@ -775,12 +692,6 @@ msgstr ""
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-msgid "  -E                      Encrypt the connection."
-msgstr ""
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr ""
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
@@ -790,9 +701,6 @@ msgstr ""
 msgid "  -U username             Specify username."
 msgstr ""
 
-msgid "  -a                      Export all printers."
-msgstr ""
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
@@ -808,9 +716,6 @@ msgstr ""
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-msgid "  -h server[:port]        Specify server address."
-msgstr ""
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
@@ -2914,10 +2819,6 @@ msgid "Bad number-up value %d."
 msgstr "Chybná hodnota %d."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr ""
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Chybný rozsah stránek %d-%d."
 
@@ -3163,9 +3064,6 @@ msgstr "Tiskárna štítků EPL2"
 msgid "Edit Configuration File"
 msgstr "Úprava konfiguračního souboru"
 
-msgid "Empty PPD file."
-msgstr ""
-
 msgid "Encryption is not supported."
 msgstr ""
 
@@ -3410,9 +3308,6 @@ msgstr "Export tiskáren do Samby"
 msgid "Expressions:"
 msgstr ""
 
-msgid "FAIL"
-msgstr ""
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -3844,10 +3739,6 @@ msgstr "Chybí hvězdička ve sloupci 1"
 msgid "Missing document-number attribute."
 msgstr ""
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr ""
-
 msgid "Missing form variable"
 msgstr ""
 
@@ -3882,10 +3773,6 @@ msgstr ""
 msgid "Missing scheme in URI"
 msgstr ""
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr ""
-
 msgid "Missing value string"
 msgstr "Chybí hodnota řetězce"
 
@@ -3954,9 +3841,6 @@ msgstr ""
 msgid "No VarBind SEQUENCE"
 msgstr "Žádná VarBind SEQUENCE"
 
-msgid "No Windows printer drivers are installed."
-msgstr ""
-
 msgid "No active connection"
 msgstr "Není aktivní spojení"
 
@@ -4081,11 +3965,6 @@ msgstr "Není povoleno tisknout."
 msgid "Note"
 msgstr "Poznámka"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-
 msgid "OK"
 msgstr "OK"
 
@@ -4139,9 +4018,6 @@ msgstr ""
 msgid "Output Mode"
 msgstr "Výstupní režim"
 
-msgid "PASS"
-msgstr ""
-
 msgid "PCL Laser Printer"
 msgstr "PCL laserová tiskárna"
 
@@ -4183,10 +4059,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Heslo pro %s na %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Heslo pro %s je vyžadováno pro přístup k %s přes Sambu: "
-
 msgid "Pause Class"
 msgstr "Pozastavení třídy"
 
@@ -4721,32 +4593,12 @@ msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr ""
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -4837,14 +4689,6 @@ msgstr ""
 msgid "Unable to get printer status."
 msgstr "Nelze získat stav tiskárny."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-
 msgid "Unable to load help index."
 msgstr ""
 
@@ -4914,10 +4758,6 @@ msgstr ""
 msgid "Unable to send data to printer."
 msgstr ""
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr ""
-
 msgid "Unable to set options"
 msgstr "Nelze nastavit parametry"
 
@@ -5093,9 +4933,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr ""
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
@@ -5105,9 +4942,6 @@ msgstr ""
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr ""
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5204,9 +5038,6 @@ msgstr ""
 msgid "Waiting for printer to finish."
 msgstr ""
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr ""
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5446,10 +5277,6 @@ msgstr "Nepodařilo se spustit \"cups-deviced\"."
 msgid "cups-driverd failed to execute."
 msgstr "Nepodařilo se spustit \"cups-driverd\"."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr ""
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
 
@@ -12609,3 +12436,6 @@ msgstr ""
 
 msgid "~/.cups/lpoptions file names default destination that does not exist."
 msgstr ""
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "Heslo pro %s je vyžadováno pro přístup k %s přes Sambu: "
diff --git a/locale/cups_es.po b/locale/cups_es.po
index cc8d76e1d..18bd1505c 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\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"
@@ -327,12 +327,6 @@ msgstr ""
 "4.3.\n"
 "                REF: Páginas 64-65, sección 5.3."
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "       cupsaddsmb [opciones] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "       cupstestdsc [opciones] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -809,103 +803,9 @@ msgstr ""
 msgid "    %d ERRORS FOUND"
 msgstr "    %d ERRORES ENCONTRADOS"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Mostrar el uso del programa"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    %%%%BoundingBox incorrecto: en línea %d.\n"
-"        REF: Página 39, %%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    %%%%Page incorrecto: en línea %d.\n"
-"        REF: Página 53, %%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    %%%%Pages incorrecto: en línea %d.\n"
-"        REF: Página 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    La línea %d es más larga de 255 caracteres (%d).\n"
-"        REF: Página 25, Line Length"
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    Falta %!PS-Adobe-3.0 en la primera línea.\n"
-"        REF: Página 17, 3.1 Conforming Documents"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-"    Falta comentario %%EndComments.        REF: Página 41, %%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    Falta comentario %%BoundingBox: o incorrecto.\n"
-"        REF: Página 39, %%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    Falta comentario %%Page: o incorrecto.\n"
-"        REF: Página 53, %%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    Falta comentario %%Pages: o incorrecto.\n"
-"        REF: Página 43, %%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    NO SE HAN ENCONTRADO ERRORES"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "    Se han visto %d líneas que exceden de 255 caracteres."
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "    Demasiados comentarios %%BeginDocument."
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "    Demasiados comentarios %%EndDocument."
-
-msgid "    Warning: file contains binary data."
-msgstr "    Advertencia: el archivo contiene datos binarios."
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    Advertencia: no hay comentario %%EndComments en el archivo."
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    Advertencia: versión DSC %.1f obsoleta en el archivo."
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Finalizar líneas con CR (Mac OS 9)."
 
@@ -924,12 +824,6 @@ msgstr "  -D                      Eliminar el archivo de entrada al terminar."
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nombre=valor         Establece la variable nombre al valor."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Cifra la conexión."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H servidor-samba       Usa el servidor SAMBA nombrado."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 "  -I include-dir          Añade directorio include a la ruta de búsqueda."
@@ -940,9 +834,6 @@ msgstr "  -P nombre_archivo.ppd   Establece archivo PPD."
 msgid "  -U username             Specify username."
 msgstr "  -U nombre_usuario       Especifica el nombre de usuario."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Exporta todas las impresoras."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catálogo.po          Carga el catálogo de mensajes especificado."
 
@@ -958,9 +849,6 @@ msgstr "  -d impresora            Usa la impresora especificada."
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Usa cada filtro desde el archivo PPD."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h servidor[:puerto]    Especifica la dirección del servidor."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i tipo/mime            Establece el tipo MIME de entrada (si no, auto-"
@@ -3090,10 +2978,6 @@ msgid "Bad number-up value %d."
 msgstr "Valor number-up (páginas por hoja) %d incorrecto."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "Opción + preferencia incorrectas en línea %d."
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Valores de page-ranges %d-%d incorrectos."
 
@@ -3347,9 +3231,6 @@ msgstr "Impresora de etiquetas EPL2"
 msgid "Edit Configuration File"
 msgstr "Editar archivo de configuración"
 
-msgid "Empty PPD file."
-msgstr "Archivo PPD vacío."
-
 msgid "Encryption is not supported."
 msgstr "El cifrado no está implementado."
 
@@ -3594,9 +3475,6 @@ msgstr "Exportar impresoras a Samba"
 msgid "Expressions:"
 msgstr "Expresiones:"
 
-msgid "FAIL"
-msgstr "FALLO"
-
 msgid "Fast Grayscale"
 msgstr "Escala de grises rápida"
 
@@ -4030,10 +3908,6 @@ msgstr "Falta un asterisco en la columna 1"
 msgid "Missing document-number attribute."
 msgstr "Falta el atributo document-number."
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "Faltan dobles comillas en línea %d."
-
 msgid "Missing form variable"
 msgstr "Falta una variable de formulario"
 
@@ -4068,10 +3942,6 @@ msgstr "Falta recurso en URI"
 msgid "Missing scheme in URI"
 msgstr "Falta esquema en URI"
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "Falta un valor en la línea %d."
-
 msgid "Missing value string"
 msgstr "Falta cadena de valores"
 
@@ -4144,9 +4014,6 @@ msgstr "No hay nombre de PPD"
 msgid "No VarBind SEQUENCE"
 msgstr "No hay Varbind SEQUENCE"
 
-msgid "No Windows printer drivers are installed."
-msgstr "No está instalado ningún controlador de impresora de Windows."
-
 msgid "No active connection"
 msgstr "No hay conexión activa"
 
@@ -4273,12 +4140,6 @@ msgstr "No se permite imprimir."
 msgid "Note"
 msgstr "Nota"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"Nota: este programa sólo valida los comentarios DSC, no los PostScript."
-
 msgid "OK"
 msgstr "OK"
 
@@ -4332,9 +4193,6 @@ msgstr "Sin memoria."
 msgid "Output Mode"
 msgstr "Modo de salida"
 
-msgid "PASS"
-msgstr "PASA"
-
 msgid "PCL Laser Printer"
 msgstr "Impresora Laser PCL"
 
@@ -4376,10 +4234,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "¿Contraseña de %s en %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Se requiere la contraseña de %s para acceder a %s vía SAMBA: "
-
 msgid "Pause Class"
 msgstr "Pausar clase"
 
@@ -4928,42 +4782,12 @@ msgstr ""
 "impresora de la clase."
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-"No se han podido copiar los archivos del controlador de impresora de 64-bit "
-"de CUPS (%d)."
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-"No se han podido copiar los archivos del controlador de impresora de 64-bit "
-"de Windows (%d)."
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr ""
-"No se han podido copiar los archivos del controlador de impresora de CUPS "
-"(%d)."
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "No se ha podido copiar el archivo PPD - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "No se ha podido copiar el archivo PPD."
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-"No se han podido copiar los archivos del controlador de impresora de Windows "
-"2000 (%d)."
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-"No se han podido copiar los archivos del controlador de impresora de Windows "
-"9x (%d)."
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5068,18 +4892,6 @@ msgstr "No se ha podido obtener el estado de la impresora"
 msgid "Unable to get printer status."
 msgstr "No se ha podido obtener el estado de la impresora."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-"No se han podido instalar los archivos del controlador de impresora de "
-"Windows 2000 (%d)."
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-"No se han podido instalar los archivos del controlador de impresora de "
-"Windows 9x (%d)."
-
 msgid "Unable to load help index."
 msgstr "No se ha podido cargar el índice de ayuda."
 
@@ -5149,11 +4961,6 @@ msgstr "No se ha podido enviar un comando al controlador de la impresora"
 msgid "Unable to send data to printer."
 msgstr "No se han podido enviar datos a la impresora."
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr ""
-"No se ha podido configurar el controlador de impresora de Windows (%d)."
-
 msgid "Unable to set options"
 msgstr "No se han podido cambiar las opciones"
 
@@ -5343,9 +5150,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "Uso: cupsaddsmb [opciones] impresora1 ... impresoraN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Uso: cupsctl [opciones] [param=valor ... paramN=valorN]"
 
@@ -5355,9 +5159,6 @@ msgstr "Uso: cupsd [opciones]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr "Uso: cupsfilter [ opciones ] [ -- ] nombre_archivo"
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5461,11 +5262,6 @@ msgstr "Esperando a que la impresora esté disponible."
 msgid "Waiting for printer to finish."
 msgstr "Esperando a que finalice la impresora."
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr ""
-"Advertencia, no está instalado ningún controlador de impresora de Windows "
-"2000."
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5705,10 +5501,6 @@ msgstr "Ha fallado al ejecutarse cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Ha fallado al ejecutarse cups-driverd."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: No hay archivo PPD para la impresora \"%s\" - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: No se puede establecer Listen o Port directamente."
 
@@ -12924,9 +12716,97 @@ msgstr ""
 #~ "                          Emitir advertencias (warnings) en vez de "
 #~ "errores."
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "       cupsaddsmb [opciones] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "       cupstestdsc [opciones] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "       programa | cupstestppd [opciones] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Mostrar el uso del programa"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    %%%%BoundingBox incorrecto: en línea %d.\n"
+#~ "        REF: Página 39, %%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    %%%%Page incorrecto: en línea %d.\n"
+#~ "        REF: Página 53, %%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    %%%%Pages incorrecto: en línea %d.\n"
+#~ "        REF: Página 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    La línea %d es más larga de 255 caracteres (%d).\n"
+#~ "        REF: Página 25, Line Length"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    Falta %!PS-Adobe-3.0 en la primera línea.\n"
+#~ "        REF: Página 17, 3.1 Conforming Documents"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr ""
+#~ "    Falta comentario %%EndComments.        REF: Página 41, %%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    Falta comentario %%BoundingBox: o incorrecto.\n"
+#~ "        REF: Página 39, %%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    Falta comentario %%Page: o incorrecto.\n"
+#~ "        REF: Página 53, %%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    Falta comentario %%Pages: o incorrecto.\n"
+#~ "        REF: Página 43, %%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "    Se han visto %d líneas que exceden de 255 caracteres."
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "    Demasiados comentarios %%BeginDocument."
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "    Demasiados comentarios %%EndDocument."
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "    Advertencia: el archivo contiene datos binarios."
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    Advertencia: no hay comentario %%EndComments en el archivo."
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    Advertencia: versión DSC %.1f obsoleta en el archivo."
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! expresión            NOT unario de la expresión."
 
@@ -13058,12 +12938,18 @@ msgstr ""
 #~ "  -C                      Enviar peticiones usando fragmentación "
 #~ "(predeterminado)."
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Cifra la conexión."
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      Ejecuta en primer plano pero separado de la "
 #~ "consola."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H servidor-samba       Usa el servidor SAMBA nombrado."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Ignora errores."
 
@@ -13112,6 +12998,9 @@ msgstr ""
 #~ msgstr ""
 #~ "  -X                      Produce XML plist en vez de texto sin formato."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Exporta todas las impresoras."
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      Produce salida CSV."
 
@@ -13141,6 +13030,9 @@ msgstr ""
 #~ "  -h regex                Hacer coincidir el nombre del equipo con la "
 #~ "expresión regular."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h servidor[:puerto]    Especifica la dirección del servidor."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13289,6 +13181,82 @@ msgstr ""
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "Opción + preferencia incorrectas en línea %d."
+
+#~ msgid "Empty PPD file."
+#~ msgstr "Archivo PPD vacío."
+
+#~ msgid "FAIL"
+#~ msgstr "FALLO"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "Faltan dobles comillas en línea %d."
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "Falta un valor en la línea %d."
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "No está instalado ningún controlador de impresora de Windows."
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "Nota: este programa sólo valida los comentarios DSC, no los PostScript."
+
+#~ msgid "PASS"
+#~ msgstr "PASA"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "Se requiere la contraseña de %s para acceder a %s vía SAMBA: "
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido copiar los archivos del controlador de impresora de 64-"
+#~ "bit de CUPS (%d)."
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido copiar los archivos del controlador de impresora de 64-"
+#~ "bit de Windows (%d)."
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido copiar los archivos del controlador de impresora de CUPS "
+#~ "(%d)."
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido copiar los archivos del controlador de impresora de "
+#~ "Windows 2000 (%d)."
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido copiar los archivos del controlador de impresora de "
+#~ "Windows 9x (%d)."
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido instalar los archivos del controlador de impresora de "
+#~ "Windows 2000 (%d)."
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "No se han podido instalar los archivos del controlador de impresora de "
+#~ "Windows 9x (%d)."
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr ""
+#~ "No se ha podido configurar el controlador de impresora de Windows (%d)."
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "Uso: cupsaddsmb [opciones] impresora1 ... impresoraN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr ""
+#~ "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr ""
@@ -13314,3 +13282,11 @@ msgstr ""
 #~ msgstr ""
 #~ "Uso: lpq [-P dest] [-U nombre_usuario] [-h nombre_equipo[:puerto]] [-l] "
 #~ "[+intervalo]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr ""
+#~ "Advertencia, no está instalado ningún controlador de impresora de Windows "
+#~ "2000."
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: No hay archivo PPD para la impresora \"%s\" - %s"
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 4c90ba805..36c279768 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -293,12 +293,6 @@ msgid ""
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-msgid "       cupsaddsmb [options] -a"
-msgstr ""
-
-msgid "       cupstestdsc [options] -"
-msgstr ""
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -677,86 +671,9 @@ msgstr ""
 msgid "    %d ERRORS FOUND"
 msgstr "    %d ERREURS TROUVÉES"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Affiche l'usage du programme"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr ""
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr ""
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr ""
-
-msgid "    Warning: file contains binary data."
-msgstr ""
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr ""
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr ""
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Fin de ligne avec CR (Mac OS 9)."
 
@@ -776,12 +693,6 @@ msgstr ""
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nom=valeur           Affecter la variable nom à cette valeur."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Chiffrer la connexion."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H serveur-samba        Utiliser le serveur SAMBA nommé."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 "  -I rep-inclus           Ajouter le répertoire au chemin des recherches."
@@ -792,9 +703,6 @@ msgstr "  -P fichier.ppd          Choisir un fichier PPD."
 msgid "  -U username             Specify username."
 msgstr "  -U nom                  Indiquer le nom d'utilisateur."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Exporter toutes les imprimantes."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalogue.po         Charger le catalogue de messages."
 
@@ -810,9 +718,6 @@ msgstr "  -d imprimante           Utiliser l'imprimante nommée."
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Utiliser tous les filtres du fichier PPD."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h serveur[:port]       Indiquer l'adresse du serveur."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i mime/type            Affecter le type MIME d'entrée (sinon type "
@@ -2925,10 +2830,6 @@ msgid "Bad number-up value %d."
 msgstr "Valeur de number-up %d incorrecte."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr ""
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Intervalle de pages erroné : %d-%d."
 
@@ -3176,9 +3077,6 @@ msgstr "Imprimante pour étiquettes EPL2"
 msgid "Edit Configuration File"
 msgstr "Modifier le fichier de configuration"
 
-msgid "Empty PPD file."
-msgstr "Fichier PPD vide."
-
 msgid "Encryption is not supported."
 msgstr "Chiffrement indisponible."
 
@@ -3423,9 +3321,6 @@ msgstr "Exporter les imprimantes vers SAMBA"
 msgid "Expressions:"
 msgstr "Expressions :"
 
-msgid "FAIL"
-msgstr "ÉCHEC"
-
 msgid "Fast Grayscale"
 msgstr "Niveaux de gris rapide"
 
@@ -3857,10 +3752,6 @@ msgstr "Astérisque manquant à la colonne 1"
 msgid "Missing document-number attribute."
 msgstr ""
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr ""
-
 msgid "Missing form variable"
 msgstr ""
 
@@ -3895,10 +3786,6 @@ msgstr ""
 msgid "Missing scheme in URI"
 msgstr ""
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr ""
-
 msgid "Missing value string"
 msgstr "Chaîne de valeur manquante"
 
@@ -3967,9 +3854,6 @@ msgstr ""
 msgid "No VarBind SEQUENCE"
 msgstr "Aucune SEQUENCE VarBind"
 
-msgid "No Windows printer drivers are installed."
-msgstr ""
-
 msgid "No active connection"
 msgstr "Aucune connexion active"
 
@@ -4094,11 +3978,6 @@ msgstr "Impression interdite"
 msgid "Note"
 msgstr "Remarque"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-
 msgid "OK"
 msgstr "OK"
 
@@ -4152,9 +4031,6 @@ msgstr ""
 msgid "Output Mode"
 msgstr "Mode de sortie"
 
-msgid "PASS"
-msgstr ""
-
 msgid "PCL Laser Printer"
 msgstr "Imprimante laser PCL"
 
@@ -4196,10 +4072,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Mot de passe pour %s sur %s ? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Un mot de passe pour %s est nécessaire pour accéder à %s via SAMBA : "
-
 msgid "Pause Class"
 msgstr "Suspendre la classe"
 
@@ -4739,32 +4611,12 @@ msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr ""
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -4855,14 +4707,6 @@ msgstr "Impossible d’obtenir l’état de l’imprimante"
 msgid "Unable to get printer status."
 msgstr "Impossible d’obtenir l’état de l’imprimante."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-
 msgid "Unable to load help index."
 msgstr ""
 
@@ -4932,10 +4776,6 @@ msgstr ""
 msgid "Unable to send data to printer."
 msgstr ""
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr ""
-
 msgid "Unable to set options"
 msgstr "Impossible de définir les options :"
 
@@ -5111,9 +4951,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr ""
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
@@ -5123,9 +4960,6 @@ msgstr ""
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr ""
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5222,9 +5056,6 @@ msgstr ""
 msgid "Waiting for printer to finish."
 msgstr ""
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr ""
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5464,10 +5295,6 @@ msgstr "L’exécution de « cups-deviced » a échoué."
 msgid "cups-driverd failed to execute."
 msgstr "L’exécution de « cups-driverd » a échoué."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr ""
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
 
@@ -12635,6 +12462,9 @@ msgstr ""
 #~ msgstr ""
 #~ "                          Signale des alertes à la place des erreurs."
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Affiche l'usage du programme"
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! expression            Opérateur NON sur une expression."
 
@@ -12762,6 +12592,9 @@ msgstr ""
 #~ msgid "  -6                      Connect using IPv6."
 #~ msgstr "  -6                      Connexion en IPv6."
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Chiffrer la connexion."
+
 #~ msgid ""
 #~ "  -E                      Test with encryption using HTTP Upgrade to TLS."
 #~ msgstr ""
@@ -12774,6 +12607,9 @@ msgstr ""
 #~ "  -F                      Exécuter en avant-plan mais détaché de la "
 #~ "console."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H serveur-samba        Utiliser le serveur SAMBA nommé."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Ignorer les erreurs."
 
@@ -12805,6 +12641,9 @@ msgstr ""
 #~ msgid "  -V version              Set default IPP version."
 #~ msgstr "  -V version              Choisir la version d'IPP par défaut."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Exporter toutes les imprimantes."
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      Produire une sortie CSV."
 
@@ -12830,6 +12669,9 @@ msgstr ""
 #~ "  -h regex                Correspondance du nom d'hôte avec l'expression "
 #~ "rationnelle."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h serveur[:port]       Indiquer l'adresse du serveur."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -12949,3 +12791,13 @@ msgstr ""
 
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
+
+#~ msgid "Empty PPD file."
+#~ msgstr "Fichier PPD vide."
+
+#~ msgid "FAIL"
+#~ msgstr "ÉCHEC"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr ""
+#~ "Un mot de passe pour %s est nécessaire pour accéder à %s via SAMBA : "
diff --git a/locale/cups_it.po b/locale/cups_it.po
index 68dcefc11..b0b6a42ad 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -322,12 +322,6 @@ msgstr ""
 "        WARN    ShortNickName richiesto dalle specifiche di PPD 4.3.\n"
 "                RIF: pagine 64-65, sezione 5.3."
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "       cupsaddsmb [opzioni] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "       cupstestdsc [opzioni] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -802,103 +796,9 @@ msgstr "      **FAIL**  Non è possibile aprire il file PPD - %s alla riga %d."
 msgid "    %d ERRORS FOUND"
 msgstr "    %d SONO STATI TROVATI DEGLI ERRORI"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Mostra l'uso del programma"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    Non è valido %%%%BoundingBox: alla riga %d.\n"
-"        RIF: pagina 39, %%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    Non è valido %%%%Page: alla riga %d.\n"
-"        RIF: pagina 53, %%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    Non è valido %%%%Pages: alla riga %d.\n"
-"        RIF: pagina 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    La riga %d è più lunga di 255 caratteri (%d).\n"
-"        RIF: pagina 25, Lunghezza della riga"
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    Manca %!PS-Adobe-3.0 nella prima riga.\n"
-"        RIF: pagina 17, 3.1 Documenti conformi"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-"    Manca il commento %%EndComments.        RIF: pagina 41, %%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    Manca o non è valido %%BoundingBox: commento.\n"
-"        RIF: pagina 39, %%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    Manca o non è valido %%Page: commenti.\n"
-"        RIF: pagina 53, %%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    Manca o non è valido %%Pages: commento.\n"
-"        RIF: pagina 43, %%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    NON SONO STATI TROVATI ERRORI"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "    Tagliare %d righe che hanno superato i 255 caratteri."
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "    Troppi %%BeginDocument commenti."
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "    Troppi %%EndDocument commenti."
-
-msgid "    Warning: file contains binary data."
-msgstr "    Attenzione: il file contiene dei dati binari."
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    Attenzione: nessun %%EndComments commento nel file."
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    Attenzione: versione obsoleta di DSC %.1f nel file."
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Termina righe con CR (Mac OS 9)."
 
@@ -918,12 +818,6 @@ msgstr ""
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D name=value           Imposta la variabile chiamata al valore."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Crittografa la connessione."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H samba-server         Utilizza il server SAMBA."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 "  -I include-dir          Aggiunge la directory include al percorso della "
@@ -935,9 +829,6 @@ msgstr "  -P filename.ppd         Imposta il file PPD."
 msgid "  -U username             Specify username."
 msgstr "  -U username             Specifica l'username."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Esporta tutte le stampanti."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 "  -c catalog.po           Carica il catalogo del messaggio specificato."
@@ -954,9 +845,6 @@ msgstr "  -d printer              Utilizza la stampante specificata."
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Utilizza tutti i filtri dal file PPD."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h server[:porta]        Specifica l'indirizzo del server."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i mime/type            Imposta il tipo di MIME di input (altrimenti auto-"
@@ -3084,10 +2972,6 @@ msgid "Bad number-up value %d."
 msgstr "Il valore di number-up %d non è valido."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "L'opzione + scelta alla riga %d non è valida."
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Il valore di page-ranges %d-%d non è valido."
 
@@ -3343,9 +3227,6 @@ msgstr "EPL2 Label Printer"
 msgid "Edit Configuration File"
 msgstr "Edita il file di configurazione"
 
-msgid "Empty PPD file."
-msgstr "Il file PPD è vuoto."
-
 msgid "Encryption is not supported."
 msgstr ""
 
@@ -3590,9 +3471,6 @@ msgstr "Esporta le stampanti per Samba"
 msgid "Expressions:"
 msgstr "Espressioni:"
 
-msgid "FAIL"
-msgstr "OPERAZIONE NON RIUSCITA CORRETTAMENTE"
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4026,10 +3904,6 @@ msgstr "Manca l'asterisco nella colonna 1"
 msgid "Missing document-number attribute."
 msgstr "Manca l'attributo di document-number."
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "Mancano le virgolette alla riga %d."
-
 msgid "Missing form variable"
 msgstr "Manca la variabile del modulo"
 
@@ -4064,10 +3938,6 @@ msgstr ""
 msgid "Missing scheme in URI"
 msgstr ""
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "Manca il valore alla riga %d."
-
 msgid "Missing value string"
 msgstr "Manca la stringa del valore"
 
@@ -4140,9 +4010,6 @@ msgstr "Nessun nome del PPD"
 msgid "No VarBind SEQUENCE"
 msgstr "Nessuna SEQUENZA di VarBind"
 
-msgid "No Windows printer drivers are installed."
-msgstr "Non è stato installato nessun driver della stampante di Windows."
-
 msgid "No active connection"
 msgstr "Nessuna connessione attiva"
 
@@ -4269,13 +4136,6 @@ msgstr "Non autorizzato a stampare."
 msgid "Note"
 msgstr "Nota"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"Nota: questo programma convalida solo i commenti DSC, non il PostScript "
-"stesso."
-
 msgid "OK"
 msgstr "OK"
 
@@ -4329,9 +4189,6 @@ msgstr "Memoria insufficiente."
 msgid "Output Mode"
 msgstr "Modalità di output"
 
-msgid "PASS"
-msgstr "OPERAZIONE RIUSCITA CON SUCCESSO"
-
 msgid "PCL Laser Printer"
 msgstr "Stampante laser PCL"
 
@@ -4373,10 +4230,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Password di %s su %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "La password di %s richiesta per accedere a %s tramite SAMBA:"
-
 msgid "Pause Class"
 msgstr "Metti in pausa la classe"
 
@@ -4925,34 +4778,12 @@ msgstr ""
 "stampante successiva."
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-"Non è possibile copiare i driver della stampante di CUPS a 64-bit (%d)."
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-"Non è possibile copiare i driver della stampante di Windows a 64-bit (%d)."
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "Non è possibile copiare i driver della stampante di CUPS (%d)."
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "Non è possibile copiare il file PPD - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "Non è possibile copiare il file PPD."
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr "Non è possibile copiare i driver di Windows 2000 della stampante (%d)."
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr "Non è possibile copiare i driver di Windows 9x della stampante (%d)."
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5057,16 +4888,6 @@ msgstr "Non è possibile ottenere lo stato della stampante"
 msgid "Unable to get printer status."
 msgstr "Non è possibile ottenere lo stato della stampante"
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-"Non è possibile installare i driver di Windows 2000 della stampante (%d)."
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-"Non è possibile installare i driver di Windows 9x della stampante (%d)."
-
 msgid "Unable to load help index."
 msgstr "Non è possibile caricare l'indice dell'aiuto."
 
@@ -5136,10 +4957,6 @@ msgstr "Non è possibile inviare il comando al driver della stampante"
 msgid "Unable to send data to printer."
 msgstr "Non è possibile inviare i dati alla stampante."
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "Non è possibile impostare i driver di Windows della stampante (%d)."
-
 msgid "Unable to set options"
 msgstr "Non è possibile impostare le opzioni"
 
@@ -5326,9 +5143,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "Uso: cupsaddsmb [opzioni] stampante1 ... stampanteN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Uso: cupsctl [opzioni] [param=valore ... paramN=valoreN]"
 
@@ -5338,9 +5152,6 @@ msgstr "Uso: cupsd [opzioni]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "Uso: cupstestdsc [opzioni] file.ps [... file.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5441,10 +5252,6 @@ msgstr "In attesa che la stampante ritorni disponibile."
 msgid "Waiting for printer to finish."
 msgstr "In attesa che la stampante finisca."
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr ""
-"Attenzione, nessun driver di Windows 2000 della stampante è stato installato."
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5684,10 +5491,6 @@ msgstr "cups-deviced ha smesso di funzionare."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd ha smesso di funzionare."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: nessun file PPD per la stampante \"%s\" - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: non è possibile impostare direttamente Listen o Port."
 
@@ -12892,9 +12695,97 @@ msgstr ""
 #~ msgstr ""
 #~ "                          Avvisa in caso di problemi invece degli errori."
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "       cupsaddsmb [opzioni] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "       cupstestdsc [opzioni] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "       programma | cupstestppd [opzioni] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Mostra l'uso del programma"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    Non è valido %%%%BoundingBox: alla riga %d.\n"
+#~ "        RIF: pagina 39, %%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    Non è valido %%%%Page: alla riga %d.\n"
+#~ "        RIF: pagina 53, %%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    Non è valido %%%%Pages: alla riga %d.\n"
+#~ "        RIF: pagina 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    La riga %d è più lunga di 255 caratteri (%d).\n"
+#~ "        RIF: pagina 25, Lunghezza della riga"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    Manca %!PS-Adobe-3.0 nella prima riga.\n"
+#~ "        RIF: pagina 17, 3.1 Documenti conformi"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr ""
+#~ "    Manca il commento %%EndComments.        RIF: pagina 41, %%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    Manca o non è valido %%BoundingBox: commento.\n"
+#~ "        RIF: pagina 39, %%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    Manca o non è valido %%Page: commenti.\n"
+#~ "        RIF: pagina 53, %%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    Manca o non è valido %%Pages: commento.\n"
+#~ "        RIF: pagina 43, %%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "    Tagliare %d righe che hanno superato i 255 caratteri."
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "    Troppi %%BeginDocument commenti."
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "    Troppi %%EndDocument commenti."
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "    Attenzione: il file contiene dei dati binari."
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    Attenzione: nessun %%EndComments commento nel file."
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    Attenzione: versione obsoleta di DSC %.1f nel file."
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! expression            Unario NON di espressione."
 
@@ -13013,11 +12904,17 @@ msgstr ""
 #~ "  -C                      Invia richieste utilizzando la suddivisione in "
 #~ "blocchi (predefinito)."
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Crittografa la connessione."
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      Avvia in foreground ma esce dalla console."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H samba-server         Utilizza il server SAMBA."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Ignora gli errori."
 
@@ -13059,6 +12956,9 @@ msgstr ""
 #~ "  -X                      Produce una plist XML invece di un testo "
 #~ "normale."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Esporta tutte le stampanti."
+
 #~ msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 #~ msgstr "  -c cupsd.conf           Imposta il file cupsd.conf da utilizzare."
 
@@ -13085,6 +12985,9 @@ msgstr ""
 #~ "  -h regex                Corrispondenza dell'hostname con l'espressione "
 #~ "regolare."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h server[:porta]        Specifica l'indirizzo del server."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13223,6 +13126,73 @@ msgstr ""
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "L'opzione + scelta alla riga %d non è valida."
+
+#~ msgid "Empty PPD file."
+#~ msgstr "Il file PPD è vuoto."
+
+#~ msgid "FAIL"
+#~ msgstr "OPERAZIONE NON RIUSCITA CORRETTAMENTE"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "Mancano le virgolette alla riga %d."
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "Manca il valore alla riga %d."
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "Non è stato installato nessun driver della stampante di Windows."
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "Nota: questo programma convalida solo i commenti DSC, non il PostScript "
+#~ "stesso."
+
+#~ msgid "PASS"
+#~ msgstr "OPERAZIONE RIUSCITA CON SUCCESSO"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "La password di %s richiesta per accedere a %s tramite SAMBA:"
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile copiare i driver della stampante di CUPS a 64-bit (%d)."
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile copiare i driver della stampante di Windows a 64-bit (%d)."
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr "Non è possibile copiare i driver della stampante di CUPS (%d)."
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile copiare i driver di Windows 2000 della stampante (%d)."
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile copiare i driver di Windows 9x della stampante (%d)."
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile installare i driver di Windows 2000 della stampante (%d)."
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "Non è possibile installare i driver di Windows 9x della stampante (%d)."
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "Non è possibile impostare i driver di Windows della stampante (%d)."
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "Uso: cupsaddsmb [opzioni] stampante1 ... stampanteN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr "Uso: cupstestdsc [opzioni] file.ps [... file.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr "Uso: cupstestppd [opzioni] file1.ppd[.gz] [... fileN.ppd[.gz]]"
@@ -13245,3 +13215,11 @@ msgstr ""
 #~ "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 #~ msgstr ""
 #~ "Uso: lpq [-P dest] [-U username] [-h hostname[:porta]] [-l] [+intervallo]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr ""
+#~ "Attenzione, nessun driver di Windows 2000 della stampante è stato "
+#~ "installato."
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: nessun file PPD per la stampante \"%s\" - %s"
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 2fbabf2cd..b1d8bce2f 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -321,12 +321,6 @@ msgstr ""
 "        警告    ShortNickName は PPD 4.3 仕様で必須です。\n"
 "                参照: 64-65 ページ、セクション 5.3。"
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "       cupsaddsmb [オプション] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "       cupstestdsc [オプション] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -802,104 +796,9 @@ msgstr ""
 msgid "    %d ERRORS FOUND"
 msgstr "    %d 個のエラーが見つかりました"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       このプログラムの利用法を表示する"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    不正な %%%%BoundingBox: (%d 行)。\n"
-"        参照: 39 ページ、%%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    不正な %%%%Page: (%d 行)。\n"
-"        参照: 53 ページ、%%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    不正な %%%%Pages: (%d 行)。\n"
-"        REF: Page 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    %d 行が 255文字より長くなっています (%d)。\n"
-"        参照: 25 ページ、Line Length"
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    先頭行に %!PS-Adobe-3.0 がありません。\n"
-"        参照: 17 ページ、3.1 Conforming Documents"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-"    %%EndComments コメントが見つかりません。\n"
-"        参照: 41 ページ、%%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    %%BoundingBox: コメントが見つからないか不正です。\n"
-"        参照: 39 ページ、%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    %%Page: コメントが見つからないか不正です。\n"
-"        参照: 53 ページ、%%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    %%Pages: コメントが見つからないか不正です。\n"
-"        参照: 43 ページ、%%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    エラーは見つかりませんでした"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "    255文字を超える %d 行が見つかりました。"
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "    %%BeginDocument コメントが多すぎます。"
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "    %%EndDocument コメントが多すぎます。"
-
-msgid "    Warning: file contains binary data."
-msgstr "    警告: ファイルにバイナリデータが含まれています。"
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    警告: ファイルに %%EndComments コメントがありません。"
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    警告: ファイルは時代遅れの DSC バージョン %.1f です。"
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    行末を CR とする (Mac OS 9)。"
 
@@ -919,12 +818,6 @@ msgid "  -D name=value           Set named variable to value."
 msgstr ""
 "  -D name=value           name で指定された変数に値 value をセットする。"
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      接続を暗号化する。"
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H sambaサーバー        指定の SAMBA サーバーを使う。"
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 "  -I include-dir          インクルードディレクトリーを検索パスに含める。"
@@ -935,9 +828,6 @@ msgstr "  -P filename.ppd         PPD ファイルを指定する。"
 msgid "  -U username             Specify username."
 msgstr "  -U username             ユーザー名を指定する。"
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      すべてのプリンターをエクスポートする。"
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalog.po           指定したメッセージカタログをロードする。"
 
@@ -954,9 +844,6 @@ msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 "  -e                      PPD ファイルからすべてのフィルターを使用する。"
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h server[:port]        サーバーアドレスを指定する。"
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i mime/type            入力の MIME タイプを指定する (指定がなければ自動タ"
@@ -3079,10 +2966,6 @@ msgid "Bad number-up value %d."
 msgstr "%d は不正な number-up 値です。"
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "%d 行に不正なオプションと選択があります。"
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "%d-%d は不正な page-ranges 値です。"
 
@@ -3340,9 +3223,6 @@ msgstr "EPL2 ラベルプリンター"
 msgid "Edit Configuration File"
 msgstr "設定ファイルの編集"
 
-msgid "Empty PPD file."
-msgstr "PPD ファイルが空です。"
-
 msgid "Encryption is not supported."
 msgstr "暗号化はサポートされていません。"
 
@@ -3587,9 +3467,6 @@ msgstr "Samba へプリンターをエクスポート"
 msgid "Expressions:"
 msgstr "式:"
 
-msgid "FAIL"
-msgstr "失敗"
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4025,10 +3902,6 @@ msgstr "1 列目にアスタリスクがありません"
 msgid "Missing document-number attribute."
 msgstr "document-number 属性がありません。"
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "%d 行に二重引用符がありません。"
-
 msgid "Missing form variable"
 msgstr "form 変数がありません。"
 
@@ -4063,10 +3936,6 @@ msgstr "URI のリソースがない"
 msgid "Missing scheme in URI"
 msgstr "URI のスキームがない"
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "%d 行に値がありません。"
-
 msgid "Missing value string"
 msgstr "値文字列がありません"
 
@@ -4139,9 +4008,6 @@ msgstr "PPD の名前がありません"
 msgid "No VarBind SEQUENCE"
 msgstr "VarBind SEQUENCE がありません"
 
-msgid "No Windows printer drivers are installed."
-msgstr "Windows プリンタードライバーがインストールされていません。"
-
 msgid "No active connection"
 msgstr "アクティブな接続はありません"
 
@@ -4266,13 +4132,6 @@ msgstr "印刷が許可されていません。"
 msgid "Note"
 msgstr "注意"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証す"
-"るものではありません。"
-
 msgid "OK"
 msgstr "OK"
 
@@ -4326,9 +4185,6 @@ msgstr "メモリーが足りません。"
 msgid "Output Mode"
 msgstr "出力モード"
 
-msgid "PASS"
-msgstr "合格"
-
 msgid "PCL Laser Printer"
 msgstr "PCL レーザープリンター"
 
@@ -4370,10 +4226,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "%s のパスワード (%s 上)? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "%s のパスワード (SAMBA 経由で %s にアクセスするのに必要):"
-
 msgid "Pause Class"
 msgstr "クラスの休止"
 
@@ -4915,34 +4767,12 @@ msgid "Unable to contact printer, queuing on next printer in class."
 msgstr "プリンターと交信できません。クラス内の次のプリンターにキューします。"
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr "64-bit 版の CUPS プリンタードライバーファイルをコピーできません (%d)。"
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr "64-bit 版の Windows プリンタードライバーをコピーできません (%d)。"
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "複数の CUPS プリンタードライバーファイルをコピーできません (%d)。"
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "PPD ファイルをコピーできません - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "PPD ファイルをコピーできません。"
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-"複数の Windows 2000 プリンタードライバーファイルをコピーできません (%d)。"
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-"複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5034,17 +4864,6 @@ msgstr "プリンターの状態を取得できません"
 msgid "Unable to get printer status."
 msgstr "プリンターの状態を取得できません。"
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-"複数の Windows 2000 プリンタードライバーファイルをインストールできません "
-"(%d)。"
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-"複数の Windows 9x プリンタードライバーファイルをインストールできません (%d)。"
-
 msgid "Unable to load help index."
 msgstr "ヘルプの索引を読み込めません。"
 
@@ -5114,10 +4933,6 @@ msgstr "プリンタードライバーにコマンドを送信できません"
 msgid "Unable to send data to printer."
 msgstr "プリンターにデータを送信することができません。"
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "Windows プリンタードライバーを設定できません (%d)。"
-
 msgid "Unable to set options"
 msgstr "オプションを設定できません"
 
@@ -5306,9 +5121,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "Usage: cupsaddsmb [オプション] プリンター1 ... プリンターN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Usage: cupsctl [オプション] [パラメータ=値 ... パラメータN=値N]"
 
@@ -5318,9 +5130,6 @@ msgstr "使い方: cupsd [オプション]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr "使い方: cupsfilter [ オプション ] [ -- ] ファイル名"
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "使い方: cupstestdsc [オプション] ファイル名.ps [... ファイル名.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5423,9 +5232,6 @@ msgstr "プリンターが使用可能になるのを待っています。"
 msgid "Waiting for printer to finish."
 msgstr "プリンターが終了するのを待っています。"
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "警告、Windows 2000 プリンタードライバーがインストールされていません。"
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5665,10 +5471,6 @@ msgstr "cups-deviced の実行に失敗しました。"
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd の実行に失敗しました。"
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: プリンター \"%s\" の PPD ファイルがありません - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
 
@@ -12910,9 +12712,98 @@ msgstr ""
 #~ msgid "                          Issue warnings instead of errors."
 #~ msgstr "                          エラーを警告として扱う。"
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "       cupsaddsmb [オプション] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "       cupstestdsc [オプション] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "       program | cupstestppd [オプション] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       このプログラムの利用法を表示する"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    不正な %%%%BoundingBox: (%d 行)。\n"
+#~ "        参照: 39 ページ、%%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    不正な %%%%Page: (%d 行)。\n"
+#~ "        参照: 53 ページ、%%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    不正な %%%%Pages: (%d 行)。\n"
+#~ "        REF: Page 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    %d 行が 255文字より長くなっています (%d)。\n"
+#~ "        参照: 25 ページ、Line Length"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    先頭行に %!PS-Adobe-3.0 がありません。\n"
+#~ "        参照: 17 ページ、3.1 Conforming Documents"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr ""
+#~ "    %%EndComments コメントが見つかりません。\n"
+#~ "        参照: 41 ページ、%%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    %%BoundingBox: コメントが見つからないか不正です。\n"
+#~ "        参照: 39 ページ、%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    %%Page: コメントが見つからないか不正です。\n"
+#~ "        参照: 53 ページ、%%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    %%Pages: コメントが見つからないか不正です。\n"
+#~ "        参照: 43 ページ、%%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "    255文字を超える %d 行が見つかりました。"
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "    %%BeginDocument コメントが多すぎます。"
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "    %%EndDocument コメントが多すぎます。"
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "    警告: ファイルにバイナリデータが含まれています。"
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    警告: ファイルに %%EndComments コメントがありません。"
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    警告: ファイルは時代遅れの DSC バージョン %.1f です。"
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "! <式>                  式を否定する単項演算子。"
 
@@ -13028,12 +12919,18 @@ msgstr ""
 #~ msgstr ""
 #~ "  -C                      chunking を用いてリクエストを送る (デフォルト)。"
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      接続を暗号化する。"
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      フォアグラウンドで実行するがコンソールからはデ"
 #~ "タッチする。"
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H sambaサーバー        指定の SAMBA サーバーを使う。"
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      エラーを無視する。"
 
@@ -13076,6 +12973,9 @@ msgstr ""
 #~ msgid "  -X                      Produce XML plist instead of plain text."
 #~ msgstr "  -X                      プレーンテキストの代わりに XML を用いる。"
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      すべてのプリンターをエクスポートする。"
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      CSV 出力を行う。"
 
@@ -13102,6 +13002,9 @@ msgstr ""
 #~ msgid "  -h regex                Match hostname to regular expression."
 #~ msgstr "  -h <正規表現>           ホスト名が正規表現にマッチするか。"
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h server[:port]        サーバーアドレスを指定する。"
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13234,6 +13137,74 @@ msgstr ""
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "%d 行に不正なオプションと選択があります。"
+
+#~ msgid "Empty PPD file."
+#~ msgstr "PPD ファイルが空です。"
+
+#~ msgid "FAIL"
+#~ msgstr "失敗"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "%d 行に二重引用符がありません。"
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "%d 行に値がありません。"
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "Windows プリンタードライバーがインストールされていません。"
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証"
+#~ "するものではありません。"
+
+#~ msgid "PASS"
+#~ msgstr "合格"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "%s のパスワード (SAMBA 経由で %s にアクセスするのに必要):"
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "64-bit 版の CUPS プリンタードライバーファイルをコピーできません (%d)。"
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr "64-bit 版の Windows プリンタードライバーをコピーできません (%d)。"
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr "複数の CUPS プリンタードライバーファイルをコピーできません (%d)。"
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "複数の Windows 2000 プリンタードライバーファイルをコピーできません (%d)。"
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "複数の Windows 2000 プリンタードライバーファイルをインストールできません "
+#~ "(%d)。"
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "複数の Windows 9x プリンタードライバーファイルをインストールできません "
+#~ "(%d)。"
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "Windows プリンタードライバーを設定できません (%d)。"
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "Usage: cupsaddsmb [オプション] プリンター1 ... プリンターN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr "使い方: cupstestdsc [オプション] ファイル名.ps [... ファイル名.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr ""
@@ -13259,3 +13230,10 @@ msgstr ""
 #~ "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 #~ msgstr ""
 #~ "使い方: lpq [-P 宛先] [-U ユーザー名] [-h ホスト名[:ポート]] [-l] [+間隔]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr ""
+#~ "警告、Windows 2000 プリンタードライバーがインストールされていません。"
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: プリンター \"%s\" の PPD ファイルがありません - %s"
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index 03f8e3af0..317544e16 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\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"
@@ -334,12 +334,6 @@ msgstr ""
 "        AVISO   ShortNickName é necessário pela especificação PPD 4.3.\n"
 "                REF: Páginas 64-65, seção 5.3."
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "     cupsaddsmb [opções] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "     cupstestdsc [opções] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -812,104 +806,9 @@ msgstr "      **FALHA** Não foi possível abrir o arquivo PPD - %s na linha %d.
 msgid "    %d ERRORS FOUND"
 msgstr "    %d ERROS ENCONTRADOS"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Mostra formas de uso do programa"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    %%%%BoundingBox inválida: na linha %d.\n"
-"        REF: Página 39, %%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    %%%%Page inválida: na linha %d.\n"
-"        REF: Página 53, %%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    %%%%Pages inválida: na linha %d.\n"
-"        REF: Página 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    Linha %d é maior do que 255 caracteres (%d).\n"
-"        REF: Página 25, Line Length"
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    Faltando %!PS-Adobe-3.0 na primeira linha.\n"
-"        REF: Página 17, 3.1 Conforming Documents"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-"    Faltando comentário de %%EndComments.        REF: Página 41, "
-"%%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    Faltando %%BoundingBox ou é inválido: comentário.\n"
-"        REF: Página 39, %%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    Faltando %%Page ou inválido: comentários.\n"
-"        REF: Página 53, %%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    Faltando %%Pages ou inválido: comentário.\n"
-"        REF: Página 43, %%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    NENHUM ERRO ENCONTRADO"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "    Cortadas %d linhas que excederam a 255 caracteres."
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "    Número excessivo de comentários de %%BeginDocument."
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "    Número excessivo de comentários de %%EndDocument."
-
-msgid "    Warning: file contains binary data."
-msgstr "    Aviso: arquivo contém dados binários."
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    Aviso: nenhum comentário de %%EndComments no arquivo."
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    Aviso: versão %.1f obsoleta de DSC no arquivo."
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Fim de linhas com CR (Mac OS 9)."
 
@@ -928,13 +827,6 @@ msgstr "  -D                      Remove o arquivo de entrada ao finalizar."
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nome=valor           Define a variável \"nome\" com \"valor\"."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Criptografa a conexão."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr ""
-"  -H servidor-samba       Usa o servidor SAMBA chamado \"servidor-samba\"."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 "  -I dir-include          Adiciona diretório de include ao caminho de "
@@ -946,9 +838,6 @@ msgstr "  -P arquivo.ppd          Define arquivo PPD."
 msgid "  -U username             Specify username."
 msgstr "  -U usuário              Especifica nome do usuário."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Exporta todas as impressoras."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 "  -c catálogo.po          Carrega o catálogo de mensagens especificado."
@@ -966,9 +855,6 @@ msgstr "  -d impressora           Usa a impressora informada."
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Usa todos os filtros do arquivo PPD."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h servidor[:porta]     Especifica o endereço do servidor."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i tipo-mime            Define o tipo MIME de entrada (caso "
@@ -3093,10 +2979,6 @@ msgid "Bad number-up value %d."
 msgstr "Valor de number-up inválido %d."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "Opção + escolha inválidas na linha %d."
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Valor de page-ranges inválido %d-%d."
 
@@ -3351,9 +3233,6 @@ msgstr "Impressora de etiqueta EPL2"
 msgid "Edit Configuration File"
 msgstr "Editar arquivo de configuração"
 
-msgid "Empty PPD file."
-msgstr "Arquivo PPD vazio."
-
 msgid "Encryption is not supported."
 msgstr "Não há suporte a criptografia."
 
@@ -3598,9 +3477,6 @@ msgstr "Exportar impressoras para o Samba"
 msgid "Expressions:"
 msgstr "Expressões:"
 
-msgid "FAIL"
-msgstr "FALHA"
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4034,10 +3910,6 @@ msgstr "Faltando asterisco na coluna 1"
 msgid "Missing document-number attribute."
 msgstr "Faltando atributo document-number."
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "Faltando aspas duplas na linha %d."
-
 msgid "Missing form variable"
 msgstr "Faltando variável de formulário"
 
@@ -4072,10 +3944,6 @@ msgstr "Faltando rescurso na URI"
 msgid "Missing scheme in URI"
 msgstr "Faltando esquema na URI"
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "Faltando valor na linha %d."
-
 msgid "Missing value string"
 msgstr "Faltando string de valor"
 
@@ -4148,9 +4016,6 @@ msgstr "Nenhum nome PPD"
 msgid "No VarBind SEQUENCE"
 msgstr "Nenhuma SEQUENCE de VarBind"
 
-msgid "No Windows printer drivers are installed."
-msgstr "Nenhum driver de impressora Windows está instalado."
-
 msgid "No active connection"
 msgstr "Nenhuma conexão ativa"
 
@@ -4277,12 +4142,6 @@ msgstr "Sem permissão para imprimir."
 msgid "Note"
 msgstr "Nota"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"Nota: esse programa só valida os comentários DSC, e não o próprio PostScript."
-
 msgid "OK"
 msgstr "OK"
 
@@ -4336,9 +4195,6 @@ msgstr "Memória insuficiente."
 msgid "Output Mode"
 msgstr "Mode de saída"
 
-msgid "PASS"
-msgstr "PASSOU"
-
 msgid "PCL Laser Printer"
 msgstr "Impressora Laser PCL"
 
@@ -4380,10 +4236,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Senha para %s em %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Senha para %s é necessária para acessar %s via SAMBA: "
-
 msgid "Pause Class"
 msgstr "Pausar classe"
 
@@ -4932,38 +4784,12 @@ msgstr ""
 "na classe."
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr ""
-"Não foi possível copiar arquivos de driver de impressora CUPS 64-bit (%d)."
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-"Não foi possível copiar arquivos de driver de impressora (%d) de Windows 64-"
-"bit."
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "Não foi possível copiar arquivos de driver de impressora (%d) de CUPS."
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "Não foi possível copiar arquivo PPD - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "Não foi possível copiar arquivo PPD."
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr ""
-"Não foi possível copiar arquivos de driver de impressora (%d) de Windows "
-"2000."
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr ""
-"Não foi possível copiar arquivos de driver de impressora (%d) de Windows 9x."
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5068,16 +4894,6 @@ msgstr "Não foi possível obter estado da impressora"
 msgid "Unable to get printer status."
 msgstr "Não foi possível obter o estado da impressora."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr ""
-"Não foi possível instalar arquivos de driver de impressora Windows 2000 (%d)."
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr ""
-"Não foi possível instalar arquivos de driver de impressora Windows 9x (%d)."
-
 msgid "Unable to load help index."
 msgstr "Não foi possível carregar índice de ajuda."
 
@@ -5147,10 +4963,6 @@ msgstr "Não foi possível enviar comando ao driver da impressora"
 msgid "Unable to send data to printer."
 msgstr "Não foi possível enviar dados à impressora."
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "Não foi possível definir driver de impressora Windows (%d)."
-
 msgid "Unable to set options"
 msgstr "Não foi possível definir opções"
 
@@ -5335,9 +5147,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "Uso: cupsaddsmb [opções] impressora1 ... impressoraN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Uso: cupsctl [opções] [param=valor ... paramN=valorN]"
 
@@ -5347,9 +5156,6 @@ msgstr "Uso: cupsd [opções]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr "Uso: cupsfilter [ opções ] [ -- ] arquivo"
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "Uso: cupstestdsc [opções] arquivo.ps [... arquivo.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5450,9 +5256,6 @@ msgstr "Esperando a impressora ficar disponível."
 msgid "Waiting for printer to finish."
 msgstr "Esperando a impressora finalizar."
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "Aviso, nenhum driver de impressora Windows 2000 está instalado."
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5692,10 +5495,6 @@ msgstr "cups-deviced falhou na execução."
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd falhou na execução."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: Nenhum arquivo PPD para a impressora \"%s\" - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: Não foi possível definir diretamente Porta ou Listen."
 
@@ -12890,9 +12689,98 @@ msgstr ""
 #~ msgid "                          Issue warnings instead of errors."
 #~ msgstr "                          Emite avisos ao invés de erros."
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "     cupsaddsmb [opções] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "     cupstestdsc [opções] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "     programa | cupstestppd [opções] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Mostra formas de uso do programa"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    %%%%BoundingBox inválida: na linha %d.\n"
+#~ "        REF: Página 39, %%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    %%%%Page inválida: na linha %d.\n"
+#~ "        REF: Página 53, %%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    %%%%Pages inválida: na linha %d.\n"
+#~ "        REF: Página 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    Linha %d é maior do que 255 caracteres (%d).\n"
+#~ "        REF: Página 25, Line Length"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    Faltando %!PS-Adobe-3.0 na primeira linha.\n"
+#~ "        REF: Página 17, 3.1 Conforming Documents"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr ""
+#~ "    Faltando comentário de %%EndComments.        REF: Página 41, "
+#~ "%%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    Faltando %%BoundingBox ou é inválido: comentário.\n"
+#~ "        REF: Página 39, %%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    Faltando %%Page ou inválido: comentários.\n"
+#~ "        REF: Página 53, %%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    Faltando %%Pages ou inválido: comentário.\n"
+#~ "        REF: Página 43, %%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "    Cortadas %d linhas que excederam a 255 caracteres."
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "    Número excessivo de comentários de %%BeginDocument."
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "    Número excessivo de comentários de %%EndDocument."
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "    Aviso: arquivo contém dados binários."
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    Aviso: nenhum comentário de %%EndComments no arquivo."
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    Aviso: versão %.1f obsoleta de DSC no arquivo."
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! expressão             Unário NÃO de expressão."
 
@@ -13021,12 +12909,19 @@ msgstr ""
 #~ msgstr ""
 #~ "  -C                      Envia requisições usando chunking (padrão)."
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Criptografa a conexão."
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      Executa em primeiro plano, mas desanexa do "
 #~ "console."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr ""
+#~ "  -H servidor-samba       Usa o servidor SAMBA chamado \"servidor-samba\"."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Ignora erros."
 
@@ -13075,6 +12970,9 @@ msgstr ""
 #~ msgstr ""
 #~ "  -X                      Produz plist XML ao invés de texto normal."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Exporta todas as impressoras."
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      Produz saída em CSV."
 
@@ -13103,6 +13001,9 @@ msgstr ""
 #~ "  -h regex                Corresponde o nome da máquina à expressão "
 #~ "regular."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h servidor[:porta]     Especifica o endereço do servidor."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13244,6 +13145,79 @@ msgstr ""
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "Opção + escolha inválidas na linha %d."
+
+#~ msgid "Empty PPD file."
+#~ msgstr "Arquivo PPD vazio."
+
+#~ msgid "FAIL"
+#~ msgstr "FALHA"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "Faltando aspas duplas na linha %d."
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "Faltando valor na linha %d."
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "Nenhum driver de impressora Windows está instalado."
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "Nota: esse programa só valida os comentários DSC, e não o próprio "
+#~ "PostScript."
+
+#~ msgid "PASS"
+#~ msgstr "PASSOU"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "Senha para %s é necessária para acessar %s via SAMBA: "
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível copiar arquivos de driver de impressora CUPS 64-bit (%d)."
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível copiar arquivos de driver de impressora (%d) de Windows "
+#~ "64-bit."
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível copiar arquivos de driver de impressora (%d) de CUPS."
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível copiar arquivos de driver de impressora (%d) de Windows "
+#~ "2000."
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível copiar arquivos de driver de impressora (%d) de Windows "
+#~ "9x."
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível instalar arquivos de driver de impressora Windows 2000 "
+#~ "(%d)."
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr ""
+#~ "Não foi possível instalar arquivos de driver de impressora Windows 9x "
+#~ "(%d)."
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "Não foi possível definir driver de impressora Windows (%d)."
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "Uso: cupsaddsmb [opções] impressora1 ... impressoraN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr "Uso: cupstestdsc [opções] arquivo.ps [... arquivo.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr "Uso: cupstestppd [opções] arquivo1.ppd[.gz] [... arquivoN.ppd[.gz]]"
@@ -13266,3 +13240,9 @@ msgstr ""
 #~ "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 #~ msgstr ""
 #~ "Uso: lpq [-P dest] [-U usuário] [-h máquina[:porta]] [-l] [+intervalo]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr "Aviso, nenhum driver de impressora Windows 2000 está instalado."
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: Nenhum arquivo PPD para a impressora \"%s\" - %s"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 8b29b8f3d..fa628f851 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -309,12 +309,6 @@ msgstr ""
 "\tWARN\tShortNickName требуется спецификацией PPD 4.3.\n"
 "                REF: Стр. 64-65, раздел 5.3."
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "\tcupsaddsmb [options] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "\tcupstestdsc [options] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -776,102 +770,9 @@ msgstr "\t**FAIL**  Не удается открыть PPD-файл – %s в с
 msgid "    %d ERRORS FOUND"
 msgstr "    ОБНАРУЖЕНО ОШИБОК: %d"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       Показать справку по использованию программы"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    Неверный %%%%BoundingBox: в строке %d\n"
-"        REF: Стр. 39, %%%%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    Неверная %%%%Page: в строке %d\n"
-"        REF: Стр. 53, %%%%Page:"
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    Неверная %%%%Pages: в строке %d\n"
-"        REF: Стр. 43, %%%%Pages:"
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    Длина строки %d больше 255 символов (%d)\n"
-"        REF: Стр. 25, Длина строки "
-
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    %!PS-Adobe-3.0 отсутствует в первой строке.\n"
-"        REF: Стр. 17, 3.1 Соответствующие документы"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    Отсутствует или неверный %%BoundingBox: комментарий.\n"
-"        REF: Стр. 39, %%BoundingBox:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    Отсутствует или неверная %%Page: комментарий.\n"
-"        REF: Стр. 53, %%Page:"
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    Отсутствуют или неверные %%Pages:  комментарий.\n"
-"        REF: Стр. 43, %%Pages:"
-
 msgid "    NO ERRORS FOUND"
 msgstr "    ОШИБОК НЕ ОБНАРУЖЕНО"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "\tНайдено %d строк, длина которых превышает 255 символов."
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "\tСлишком много комментариев %%BeginDocument"
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "\tСлишком много комментариев %%EndDocument"
-
-msgid "    Warning: file contains binary data."
-msgstr "\tWARNING: файл содержит бинарные данные."
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    WARNING: нет комментария %%EndComments в файле."
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    WARNING: устаревшая версия DSC %.1f в файле."
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Строки заканчиваются на CR (Mac OS 9)."
 
@@ -891,12 +792,6 @@ msgstr "  -D                      Удалить входной файл пос�
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D name=value           Определение переменной."
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      Подключение к серверу шифруется."
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H samba-server         Использовать заданный сервер SAMBA."
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr "  -I include-dir          Добавить каталог include в путь поиска."
 
@@ -906,9 +801,6 @@ msgstr "  -P filename.ppd         Задать PPD-файл."
 msgid "  -U username             Specify username."
 msgstr "  -U username             Указание имени пользователя."
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      Экспорт всех принтеров."
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalog.po           Загружается указанный каталог сообщений."
 
@@ -924,9 +816,6 @@ msgstr "  -d printer              Использовать заданный пр
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Использовать каждый фильтр из PPD-файла."
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h server[:port]        Задать адрес и порт сервера."
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i mime/type            Указать MIME-тип данных на входе (иначе "
@@ -3056,10 +2945,6 @@ msgid "Bad number-up value %d."
 msgstr "Неверное значение number-up %d."
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "Неверный параметр + выбор в строке %d."
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Неверные значения page-ranges %d-%d."
 
@@ -3308,9 +3193,6 @@ msgstr "Принтер для печати этикеток EPL2"
 msgid "Edit Configuration File"
 msgstr "Редактировать файл конфигурации"
 
-msgid "Empty PPD file."
-msgstr "Пустой PPD файл."
-
 msgid "Encryption is not supported."
 msgstr "Шифрование не поддерживается."
 
@@ -3555,9 +3437,6 @@ msgstr "Экспортировать принтеры в Samba"
 msgid "Expressions:"
 msgstr "Выражение:"
 
-msgid "FAIL"
-msgstr "FAIL"
-
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -3991,10 +3870,6 @@ msgstr "Отсутствует звездочка в колонке 1"
 msgid "Missing document-number attribute."
 msgstr "Отсутствует атрибут document-number"
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "Отсутствует двойная кавычка в строке %d"
-
 msgid "Missing form variable"
 msgstr "Отсутствует переменная формы"
 
@@ -4029,10 +3904,6 @@ msgstr "Отсутствует resource в URI"
 msgid "Missing scheme in URI"
 msgstr "Отсутствует scheme в URI"
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "Отсутствует значение в строке %d."
-
 msgid "Missing value string"
 msgstr "Отсутствует строка значения"
 
@@ -4105,9 +3976,6 @@ msgstr "Нет имени PPD"
 msgid "No VarBind SEQUENCE"
 msgstr "Нет последовательности VarBind"
 
-msgid "No Windows printer drivers are installed."
-msgstr "Нет установленных драйверов принтера Windows."
-
 msgid "No active connection"
 msgstr "Нет рабочего подключения"
 
@@ -4233,13 +4101,6 @@ msgstr "Не разрешено печатать."
 msgid "Note"
 msgstr "Примечание"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr ""
-"Примечание: данная программа проверяет только комментарии DSC, а не сам "
-"PostScript."
-
 msgid "OK"
 msgstr "ОК"
 
@@ -4293,9 +4154,6 @@ msgstr "Недостаточно памяти."
 msgid "Output Mode"
 msgstr "Режим вывода"
 
-msgid "PASS"
-msgstr "PASS"
-
 msgid "PCL Laser Printer"
 msgstr "Лазерный принтер PCL"
 
@@ -4337,10 +4195,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "Пароль для %s на %s? "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "Для доступа к %s через SAMBA требуется пароль для %s: "
-
 msgid "Pause Class"
 msgstr "Приостановить группу"
 
@@ -4881,33 +4735,12 @@ msgstr ""
 "принтере в группе."
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr "Не удается копировать 64-битовые файлы драйвера принтера CUPS (%d)."
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr ""
-"Не удается копировать 64-битовые файлы драйвера принтера для Windows (%d)."
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "Не удается копировать файлы драйвера принтера CUPS (%d)"
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "Не удается копировать PPD-файл - %s"
 
 msgid "Unable to copy PPD file."
 msgstr "Не удается копировать PPD-файл."
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr "Не удается копировать файлы драйвера принтера Windows 2000 (%d)"
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)"
-
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -5005,14 +4838,6 @@ msgstr "Не удается получить статус принтера"
 msgid "Unable to get printer status."
 msgstr "Не удается получить статус принтера."
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr "Не удается установить файлы драйвера принтера Windows 2000 (%d)"
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr "Не удается установить файлы драйвера принтера Windows 9x (%d)"
-
 msgid "Unable to load help index."
 msgstr "Не удается загрузить содержание справки."
 
@@ -5082,10 +4907,6 @@ msgstr "Не удается отправить команду драйверу �
 msgid "Unable to send data to printer."
 msgstr "Не удается отправить данные на принтер."
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "Не удается настроить драйвер принтера Windows (%d)."
-
 msgid "Unable to set options"
 msgstr "Не удается настроить параметры"
 
@@ -5275,9 +5096,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr ""
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
@@ -5287,9 +5105,6 @@ msgstr ""
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr ""
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5391,9 +5206,6 @@ msgstr "Ожидание доступа к принтеру."
 msgid "Waiting for printer to finish."
 msgstr "Ожидание окончания работы принтера."
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "Внимание, драйверы принтера Windows 2000 не установлены"
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5633,10 +5445,6 @@ msgstr "Не удалось выполнить cups-deviced."
 msgid "cups-driverd failed to execute."
 msgstr "Не удалось выполнить cups-driverd."
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb: Нет PPD-файла для принтера \"%s\" - %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: Не удается задать Listen или Port."
 
@@ -12832,9 +12640,92 @@ msgstr ""
 #~ msgid "                          Issue warnings instead of errors."
 #~ msgstr "                     Выдавать предупреждения вместо ошибки"
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "\tcupsaddsmb [options] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "\tcupstestdsc [options] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "\tprogram | cupstestppd [options] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       Показать справку по использованию программы"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    Неверный %%%%BoundingBox: в строке %d\n"
+#~ "        REF: Стр. 39, %%%%BoundingBox:"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    Неверная %%%%Page: в строке %d\n"
+#~ "        REF: Стр. 53, %%%%Page:"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    Неверная %%%%Pages: в строке %d\n"
+#~ "        REF: Стр. 43, %%%%Pages:"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    Длина строки %d больше 255 символов (%d)\n"
+#~ "        REF: Стр. 25, Длина строки "
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    %!PS-Adobe-3.0 отсутствует в первой строке.\n"
+#~ "        REF: Стр. 17, 3.1 Соответствующие документы"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    Отсутствует или неверный %%BoundingBox: комментарий.\n"
+#~ "        REF: Стр. 39, %%BoundingBox:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    Отсутствует или неверная %%Page: комментарий.\n"
+#~ "        REF: Стр. 53, %%Page:"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    Отсутствуют или неверные %%Pages:  комментарий.\n"
+#~ "        REF: Стр. 43, %%Pages:"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "\tНайдено %d строк, длина которых превышает 255 символов."
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "\tСлишком много комментариев %%BeginDocument"
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "\tСлишком много комментариев %%EndDocument"
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "\tWARNING: файл содержит бинарные данные."
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    WARNING: нет комментария %%EndComments в файле."
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    WARNING: устаревшая версия DSC %.1f в файле."
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! expression            Логическое NOT для выражения."
 
@@ -12954,12 +12845,18 @@ msgstr ""
 #~ "  -C                      Передача запроса с использованием chunking (по "
 #~ "умолчанию)"
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      Подключение к серверу шифруется."
+
 #~ msgid ""
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr ""
 #~ "  -F                      Запускать с высоким приоритетом и отдельно от "
 #~ "консоли."
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H samba-server         Использовать заданный сервер SAMBA."
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      Игнорировать ошибки."
 
@@ -13008,6 +12905,9 @@ msgstr ""
 #~ msgstr ""
 #~ "  -X                      Выводить XML plist вместо обычного текста."
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      Экспорт всех принтеров."
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      Вывод в формате CSV."
 
@@ -13033,6 +12933,9 @@ msgstr ""
 #~ msgid "  -h regex                Match hostname to regular expression."
 #~ msgstr "  -h regex                Найти hostname по регулярному выражению."
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h server[:port]        Задать адрес и порт сервера."
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13170,6 +13073,62 @@ msgstr ""
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "Неверный параметр + выбор в строке %d."
+
+#~ msgid "Empty PPD file."
+#~ msgstr "Пустой PPD файл."
+
+#~ msgid "FAIL"
+#~ msgstr "FAIL"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "Отсутствует двойная кавычка в строке %d"
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "Отсутствует значение в строке %d."
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "Нет установленных драйверов принтера Windows."
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr ""
+#~ "Примечание: данная программа проверяет только комментарии DSC, а не сам "
+#~ "PostScript."
+
+#~ msgid "PASS"
+#~ msgstr "PASS"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "Для доступа к %s через SAMBA требуется пароль для %s: "
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr "Не удается копировать 64-битовые файлы драйвера принтера CUPS (%d)."
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr ""
+#~ "Не удается копировать 64-битовые файлы драйвера принтера для Windows (%d)."
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr "Не удается копировать файлы драйвера принтера CUPS (%d)"
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr "Не удается копировать файлы драйвера принтера Windows 2000 (%d)"
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)"
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr "Не удается установить файлы драйвера принтера Windows 2000 (%d)"
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr "Не удается установить файлы драйвера принтера Windows 9x (%d)"
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "Не удается настроить драйвер принтера Windows (%d)."
+
 #~ msgid ""
 #~ "Usage: lpoptions [-h server] [-E] -d printer\n"
 #~ "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -13181,3 +13140,9 @@ msgstr ""
 #~ "       lpoptions [-h server] [-E] [-p printer] -l\n"
 #~ "       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
 #~ "       lpoptions [-h server] [-E] -x printer"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr "Внимание, драйверы принтера Windows 2000 не установлены"
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb: Нет PPD-файла для принтера \"%s\" - %s"
diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index e267e5eed..2b0861968 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: 2018-12-06 14:40-0500\n"
+"POT-Creation-Date: 2018-12-06 14:58-0500\n"
 "PO-Revision-Date: 2018-10-09 00:21-0500\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.io>\n"
 "Language-Team: \n"
@@ -318,12 +318,6 @@ msgstr ""
 "        警告    PPD 4.3 规范需要 ShortNickName。\n"
 "                引用：第 64-65 页，章节 5.3。"
 
-msgid "       cupsaddsmb [options] -a"
-msgstr "       cupsaddsmb [选项] -a"
-
-msgid "       cupstestdsc [options] -"
-msgstr "       cupstestdsc [选项] -"
-
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -780,103 +774,9 @@ msgstr "      **失败**  无法打开 PPD 文件 — 行 %2$d 上的 %1$s。"
 msgid "    %d ERRORS FOUND"
 msgstr "    发现 %d 个错误"
 
-msgid "    -h       Show program usage"
-msgstr "    -h       显示程序使用方法"
-
-#, c-format
-msgid ""
-"    Bad %%%%BoundingBox: on line %d.\n"
-"        REF: Page 39, %%%%BoundingBox:"
-msgstr ""
-"    无效的 %%%%BoundingBox：位于行 %d。\n"
-"        引用：第 39 页，%%%%BoundingBox："
-
-#, c-format
-msgid ""
-"    Bad %%%%Page: on line %d.\n"
-"        REF: Page 53, %%%%Page:"
-msgstr ""
-"    无效的 %%%%Page：位于行 %d。\n"
-"        引用：第 53 页，%%%%Page："
-
-#, c-format
-msgid ""
-"    Bad %%%%Pages: on line %d.\n"
-"        REF: Page 43, %%%%Pages:"
-msgstr ""
-"    无效的 %%%%Pages：位于行 %d。\n"
-"        引用：第 43 页，%%%%Pages："
-
-#, c-format
-msgid ""
-"    Line %d is longer than 255 characters (%d).\n"
-"        REF: Page 25, Line Length"
-msgstr ""
-"    行 %d 长度超过 255 个字符 (%d)。\n"
-"        引用：第 25 页，行长度"
-
-# Should chapter titles be translated?
-msgid ""
-"    Missing %!PS-Adobe-3.0 on first line.\n"
-"        REF: Page 17, 3.1 Conforming Documents"
-msgstr ""
-"    首行缺少 %!PS-Adobe-3.0。\n"
-"        引用：第 17 页，3.1 符合规范的文档"
-
-#, c-format
-msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr "    缺少 %%EndComments 注释。        引用：第 41 页，%%EndComments"
-
-#, c-format
-msgid ""
-"    Missing or bad %%BoundingBox: comment.\n"
-"        REF: Page 39, %%BoundingBox:"
-msgstr ""
-"    %%BoundingBox 缺失或无效：注释。\n"
-"        引用：第 39 页，%%BoundingBox："
-
-#, c-format
-msgid ""
-"    Missing or bad %%Page: comments.\n"
-"        REF: Page 53, %%Page:"
-msgstr ""
-"    %%Page 缺失或无效：注释。\n"
-"        引用：第 53 页，%%Page："
-
-#, c-format
-msgid ""
-"    Missing or bad %%Pages: comment.\n"
-"        REF: Page 43, %%Pages:"
-msgstr ""
-"    %%Pages 缺失或无效：注释。\n"
-"        引用：第 43 页，%%Pages："
-
 msgid "    NO ERRORS FOUND"
 msgstr "    未发现错误"
 
-#, c-format
-msgid "    Saw %d lines that exceeded 255 characters."
-msgstr "    共发现 %d 个超过 255 字符的行。"
-
-#, c-format
-msgid "    Too many %%BeginDocument comments."
-msgstr "    %%BeginDocument 注释过多。"
-
-#, c-format
-msgid "    Too many %%EndDocument comments."
-msgstr "    %%EndDocument 注释过多。"
-
-msgid "    Warning: file contains binary data."
-msgstr "    警告：文件包含二进制数据。"
-
-#, c-format
-msgid "    Warning: no %%EndComments comment in file."
-msgstr "    警告：文件中无 %%EndComments 注释。"
-
-#, c-format
-msgid "    Warning: obsolete DSC version %.1f in file."
-msgstr "    警告：文件中包含已遗弃的 DSC 版本 %.1f。"
-
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    使用 CR 行末 (Mac OS 9)。"
 
@@ -895,12 +795,6 @@ msgstr "  -D                      完成后删除输入文件。"
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D 名称=赋值           为指定变量赋值。"
 
-msgid "  -E                      Encrypt the connection."
-msgstr "  -E                      加密连接。"
-
-msgid "  -H samba-server         Use the named SAMBA server."
-msgstr "  -H samba-server         使用指定的 Samba 服务器。"
-
 msgid "  -I include-dir          Add include directory to search path."
 msgstr "  -I include-dir          将引用目录加入到搜索路径。"
 
@@ -910,9 +804,6 @@ msgstr "  -P filename.ppd         设置 PPD 文件。"
 msgid "  -U username             Specify username."
 msgstr "  -U 用户名              指定用户名。"
 
-msgid "  -a                      Export all printers."
-msgstr "  -a                      导出所有打印机。"
-
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalog.po           载入指定的消息索引。"
 
@@ -928,9 +819,6 @@ msgstr "  -d 打印机               使用指定的打印机。"
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      使用来自 PPD 文件的所有滤镜。"
 
-msgid "  -h server[:port]        Specify server address."
-msgstr "  -h 服务器[:端口]        指定服务器地址。"
-
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr "  -i mime/type            设置输入的 MIME 类型（否则自动探测类型）。"
 
@@ -3041,10 +2929,6 @@ msgid "Bad number-up value %d."
 msgstr "无效的 number-up 值 %d。"
 
 #, c-format
-msgid "Bad option + choice on line %d."
-msgstr "行 %d 中存在无效的选项 + 选择。"
-
-#, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "无效的 page-range 值 %d-%d。"
 
@@ -3299,9 +3183,6 @@ msgstr "EPL2 标签打印机"
 msgid "Edit Configuration File"
 msgstr "编辑配置文件"
 
-msgid "Empty PPD file."
-msgstr "空 PPD 文件。"
-
 msgid "Encryption is not supported."
 msgstr "不支持加密。"
 
@@ -3545,9 +3426,6 @@ msgstr "将打印机导出到 Samba"
 msgid "Expressions:"
 msgstr "表达式："
 
-msgid "FAIL"
-msgstr "失败"
-
 msgid "Fast Grayscale"
 msgstr "快速灰度"
 
@@ -3981,10 +3859,6 @@ msgstr "列 1 中缺少星号"
 msgid "Missing document-number attribute."
 msgstr "缺少 document-number 属性。"
 
-#, c-format
-msgid "Missing double quote on line %d."
-msgstr "行 %d 缺少双引号。"
-
 msgid "Missing form variable"
 msgstr "缺少表单变量"
 
@@ -4019,10 +3893,6 @@ msgstr "URI 中缺少资源"
 msgid "Missing scheme in URI"
 msgstr "URI 中缺少方案"
 
-#, c-format
-msgid "Missing value on line %d."
-msgstr "行 %d 缺少值。"
-
 msgid "Missing value string"
 msgstr "缺少值字串。"
 
@@ -4095,9 +3965,6 @@ msgstr "无 PPD 名称"
 msgid "No VarBind SEQUENCE"
 msgstr "无 VarBind SEQUENCE"
 
-msgid "No Windows printer drivers are installed."
-msgstr "未安装 Windows 打印机驱动。"
-
 msgid "No active connection"
 msgstr "无活动连接"
 
@@ -4222,11 +4089,6 @@ msgstr "不允许打印。"
 msgid "Note"
 msgstr "注释"
 
-msgid ""
-"Note: this program only validates the DSC comments, not the PostScript "
-"itself."
-msgstr "注：此程序仅用于检验 DSC 注释，而非 PostScript 本身。"
-
 msgid "OK"
 msgstr "确定"
 
@@ -4280,9 +4142,6 @@ msgstr "内存耗尽。"
 msgid "Output Mode"
 msgstr "输出模式"
 
-msgid "PASS"
-msgstr "通过"
-
 msgid "PCL Laser Printer"
 msgstr "PCL 激光打印机"
 
@@ -4324,10 +4183,6 @@ msgstr "ParamCustominTearInterval"
 msgid "Password for %s on %s? "
 msgstr "请输入 %2$s 上 %1$s 的密码 "
 
-#, c-format
-msgid "Password for %s required to access %s via SAMBA: "
-msgstr "要通过 SAMBA 访问 %2$s，必须输入 %1$s 的密码："
-
 msgid "Pause Class"
 msgstr "暂停类"
 
@@ -4864,32 +4719,12 @@ msgid "Unable to contact printer, queuing on next printer in class."
 msgstr "无法联系打印机，已列队于类中的下一台打印机。"
 
 #, c-format
-msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr "无法复制 64 位 CUPS 打印机驱动文件（%d）。"
-
-#, c-format
-msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr "无法复制 64 位 Windows 打印机驱动文件（%d）。"
-
-#, c-format
-msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "无法复制 CUPS 打印机驱动文件（%d）。"
-
-#, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "无法复制 PPD 文件 — %s"
 
 msgid "Unable to copy PPD file."
 msgstr "无法复制 PPD 文件。"
 
-#, c-format
-msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr "无法复制 Windows 2000 打印机驱动文件（%d）。"
-
-#, c-format
-msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr "无法复制 Windows 9x 打印机驱动文件（%d）。"
-
 msgid "Unable to create credentials from array."
 msgstr "无法从打印组创建服务器凭据。"
 
@@ -4980,14 +4815,6 @@ msgstr "无法获取打印机状态"
 msgid "Unable to get printer status."
 msgstr "无法获取打印机状态。"
 
-#, c-format
-msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr "无法安装 Windows 2000 打印机驱动文件（%d）。"
-
-#, c-format
-msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr "无法安装 Windows 9x 打印机驱动文件（%d）。"
-
 msgid "Unable to load help index."
 msgstr "无法载入帮助索引。"
 
@@ -5058,10 +4885,6 @@ msgstr "无法向打印机驱动发送命令"
 msgid "Unable to send data to printer."
 msgstr "无法向打印机发送数据。"
 
-#, c-format
-msgid "Unable to set Windows printer driver (%d)."
-msgstr "无法设置 Windows 打印机驱动（%d）。"
-
 msgid "Unable to set options"
 msgstr "无法设置选项"
 
@@ -5245,9 +5068,6 @@ msgid ""
 "       cancel [options] [destination-id]"
 msgstr ""
 
-msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
-msgstr "用法：cupsaddsmb [options] printer1 ... printerN"
-
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "用法：cupsctl [options] [param=value ... paramN=valueN]"
 
@@ -5257,9 +5077,6 @@ msgstr "用法：cupsd [options]"
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr "用法：cupsfilter [ options ] [ -- ] filename"
 
-msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
-msgstr "用法：cupstestdsc [options] filename.ps [... filename.ps]"
-
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [options] -"
@@ -5361,9 +5178,6 @@ msgstr "正在等待打印机变得可用。"
 msgid "Waiting for printer to finish."
 msgstr "正在等待打印机完成任务。"
 
-msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "警告，未安装 Windows 2000 打印机驱动。"
-
 msgid "Warning: This program will be removed in a future version of CUPS."
 msgstr ""
 
@@ -5602,10 +5416,6 @@ msgstr "无法执行 cups-deviced。"
 msgid "cups-driverd failed to execute."
 msgstr "无法执行 cups-driverd。"
 
-#, c-format
-msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
-msgstr "cupsaddsmb：打印机“%s”无 PPD 文件 — %s"
-
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl：无法直接设置 Listen 或 Port 值。"
 
@@ -12785,9 +12595,97 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "                          Issue warnings instead of errors."
 #~ msgstr "                          发出警告而不是错误。"
 
+#~ msgid "       cupsaddsmb [options] -a"
+#~ msgstr "       cupsaddsmb [选项] -a"
+
+#~ msgid "       cupstestdsc [options] -"
+#~ msgstr "       cupstestdsc [选项] -"
+
 #~ msgid "       program | cupstestppd [options] -"
 #~ msgstr "       程序 | cupstestppd [选项] -"
 
+#~ msgid "    -h       Show program usage"
+#~ msgstr "    -h       显示程序使用方法"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d.\n"
+#~ "        REF: Page 39, %%%%BoundingBox:"
+#~ msgstr ""
+#~ "    无效的 %%%%BoundingBox：位于行 %d。\n"
+#~ "        引用：第 39 页，%%%%BoundingBox："
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d.\n"
+#~ "        REF: Page 53, %%%%Page:"
+#~ msgstr ""
+#~ "    无效的 %%%%Page：位于行 %d。\n"
+#~ "        引用：第 53 页，%%%%Page："
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d.\n"
+#~ "        REF: Page 43, %%%%Pages:"
+#~ msgstr ""
+#~ "    无效的 %%%%Pages：位于行 %d。\n"
+#~ "        引用：第 43 页，%%%%Pages："
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d).\n"
+#~ "        REF: Page 25, Line Length"
+#~ msgstr ""
+#~ "    行 %d 长度超过 255 个字符 (%d)。\n"
+#~ "        引用：第 25 页，行长度"
+
+# Should chapter titles be translated?
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line.\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents"
+#~ msgstr ""
+#~ "    首行缺少 %!PS-Adobe-3.0。\n"
+#~ "        引用：第 17 页，3.1 符合规范的文档"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+#~ msgstr "    缺少 %%EndComments 注释。        引用：第 41 页，%%EndComments"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment.\n"
+#~ "        REF: Page 39, %%BoundingBox:"
+#~ msgstr ""
+#~ "    %%BoundingBox 缺失或无效：注释。\n"
+#~ "        引用：第 39 页，%%BoundingBox："
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments.\n"
+#~ "        REF: Page 53, %%Page:"
+#~ msgstr ""
+#~ "    %%Page 缺失或无效：注释。\n"
+#~ "        引用：第 53 页，%%Page："
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment.\n"
+#~ "        REF: Page 43, %%Pages:"
+#~ msgstr ""
+#~ "    %%Pages 缺失或无效：注释。\n"
+#~ "        引用：第 43 页，%%Pages："
+
+#~ msgid "    Saw %d lines that exceeded 255 characters."
+#~ msgstr "    共发现 %d 个超过 255 字符的行。"
+
+#~ msgid "    Too many %%BeginDocument comments."
+#~ msgstr "    %%BeginDocument 注释过多。"
+
+#~ msgid "    Too many %%EndDocument comments."
+#~ msgstr "    %%EndDocument 注释过多。"
+
+#~ msgid "    Warning: file contains binary data."
+#~ msgstr "    警告：文件包含二进制数据。"
+
+#~ msgid "    Warning: no %%EndComments comment in file."
+#~ msgstr "    警告：文件中无 %%EndComments 注释。"
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file."
+#~ msgstr "    警告：文件中包含已遗弃的 DSC 版本 %.1f。"
+
 #~ msgid "  ! expression            Unary NOT of expression."
 #~ msgstr "  ! 表达式                一元否定表达式。"
 
@@ -12899,6 +12797,9 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "  -C                      Send requests using chunking (default)."
 #~ msgstr "  -C                      使用分块请求发送（默认）。"
 
+#~ msgid "  -E                      Encrypt the connection."
+#~ msgstr "  -E                      加密连接。"
+
 #~ msgid ""
 #~ "  -E                      Test with encryption using HTTP Upgrade to TLS."
 #~ msgstr "  -E                      带有使用 HTTP 升级到 TLS 加密的测试。"
@@ -12907,6 +12808,9 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ "  -F                      Run in the foreground but detach from console."
 #~ msgstr "  -F                      在前台运行但从终端分离。"
 
+#~ msgid "  -H samba-server         Use the named SAMBA server."
+#~ msgstr "  -H samba-server         使用指定的 Samba 服务器。"
+
 #~ msgid "  -I                      Ignore errors."
 #~ msgstr "  -I                      忽略错误。"
 
@@ -12948,6 +12852,9 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "  -X                      Produce XML plist instead of plain text."
 #~ msgstr "  -X                      生成 XML plist 而不是纯文本。"
 
+#~ msgid "  -a                      Export all printers."
+#~ msgstr "  -a                      导出所有打印机。"
+
 #~ msgid "  -c                      Produce CSV output."
 #~ msgstr "  -c                      生成 CSV 输出。"
 
@@ -12975,6 +12882,9 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "  -h regex                Match hostname to regular expression."
 #~ msgstr "  -h 正则表达式           使用正则表达式匹配主机名。"
 
+#~ msgid "  -h server[:port]        Specify server address."
+#~ msgstr "  -h 服务器[:端口]        指定服务器地址。"
+
 #~ msgid ""
 #~ "  -i seconds              Repeat the last file with the given time "
 #~ "interval."
@@ -13111,6 +13021,65 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ msgid "  {}                      URI"
 #~ msgstr "  {}                      URI"
 
+#~ msgid "Bad option + choice on line %d."
+#~ msgstr "行 %d 中存在无效的选项 + 选择。"
+
+#~ msgid "Empty PPD file."
+#~ msgstr "空 PPD 文件。"
+
+#~ msgid "FAIL"
+#~ msgstr "失败"
+
+#~ msgid "Missing double quote on line %d."
+#~ msgstr "行 %d 缺少双引号。"
+
+#~ msgid "Missing value on line %d."
+#~ msgstr "行 %d 缺少值。"
+
+#~ msgid "No Windows printer drivers are installed."
+#~ msgstr "未安装 Windows 打印机驱动。"
+
+#~ msgid ""
+#~ "Note: this program only validates the DSC comments, not the PostScript "
+#~ "itself."
+#~ msgstr "注：此程序仅用于检验 DSC 注释，而非 PostScript 本身。"
+
+#~ msgid "PASS"
+#~ msgstr "通过"
+
+#~ msgid "Password for %s required to access %s via SAMBA: "
+#~ msgstr "要通过 SAMBA 访问 %2$s，必须输入 %1$s 的密码："
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+#~ msgstr "无法复制 64 位 CUPS 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+#~ msgstr "无法复制 64 位 Windows 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)."
+#~ msgstr "无法复制 CUPS 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)."
+#~ msgstr "无法复制 Windows 2000 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)."
+#~ msgstr "无法复制 Windows 9x 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)."
+#~ msgstr "无法安装 Windows 2000 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)."
+#~ msgstr "无法安装 Windows 9x 打印机驱动文件（%d）。"
+
+#~ msgid "Unable to set Windows printer driver (%d)."
+#~ msgstr "无法设置 Windows 打印机驱动（%d）。"
+
+#~ msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+#~ msgstr "用法：cupsaddsmb [options] printer1 ... printerN"
+
+#~ msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+#~ msgstr "用法：cupstestdsc [options] filename.ps [... filename.ps]"
+
 #~ msgid ""
 #~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 #~ msgstr ""
@@ -13134,3 +13103,9 @@ msgstr "~/.cups/lpoptions 文件所指定的默认目标不存在。"
 #~ "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 #~ msgstr ""
 #~ "用法：lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed."
+#~ msgstr "警告，未安装 Windows 2000 打印机驱动。"
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+#~ msgstr "cupsaddsmb：打印机“%s”无 PPD 文件 — %s"
author	Michael R Sweet <michael.r.sweet@gmail.com>	2018-12-06 14:58:20 -0500
committer	Michael R Sweet <michael.r.sweet@gmail.com>	2018-12-06 14:58:20 -0500
commit	46637f30d7f7cb92ea72e75e4a518dd150138269 (patch)
tree	ec3b39306fb0cace762047d369a8c497ef81a6a6 /locale
parent	f1def5b85f51120f5dc1eb21e1f38860ef41be9c (diff)
download	cups-46637f30d7f7cb92ea72e75e4a518dd150138269.tar.gz