diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/apport.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/apport.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/apport.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/apport.po	2015-08-14 07:59:22.000000000 +0000
@@ -7,204 +7,423 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-16 23:11+0000\n"
+"POT-Creation-Date: 2015-05-15 17:56+0000\n"
 "PO-Revision-Date: 2010-09-07 03:09+0000\n"
 "Last-Translator: Steve Langasek <steve.langasek@canonical.com>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:24+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:24+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: cv\n"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429
-#: ../debian/tmp/usr/share/apport/apport-kde.py:169
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 ../kde/apport-kde.py:169
-#: ../gtk/apport-gtk.py:177 ../bin/apport-cli.py:178
-#: ../debian/tmp/usr/bin/apport-cli.py:178
+#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:468 ../kde/apport-kde.py:503
+#: ../kde/apport-kde.py:522 ../debian/tmp/usr/share/apport/apport-kde.py:468
+#: ../debian/tmp/usr/share/apport/apport-kde.py:503
+#: ../debian/tmp/usr/share/apport/apport-kde.py:522
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1
+msgid "Apport"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
+msgid "Crash report"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5
+msgid "<big><b>Sorry, an internal error happened.</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:6 ../kde/apport-kde.py:240 ../gtk/apport-gtk.py:300
+#: ../debian/tmp/usr/share/apport/apport-kde.py:240
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:300
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6
+msgid "If you notice further problems, try restarting the computer."
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
+msgid "Send an error report to help fix this problem"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8
+msgid "Ignore future problems of this program version"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:291 ../gtk/apport-gtk.py:204
+#: ../gtk/apport-gtk.py:573 ../debian/tmp/usr/share/apport/apport-kde.py:291
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:573
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
+msgid "Show Details"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
+msgid "_Examine locally"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:233 ../gtk/apport-gtk.py:287
+#: ../debian/tmp/usr/share/apport/apport-kde.py:233
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:287
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11
+msgid "Leave Closed"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:12 ../kde/apport-kde.py:230 ../kde/apport-kde.py:243
+#: ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303
+#: ../debian/tmp/usr/share/apport/apport-kde.py:230
+#: ../debian/tmp/usr/share/apport/apport-kde.py:243
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:216
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:303
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12
+msgid "Continue"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14
+msgid ""
+"Information is being collected that may help the developers fix the problem "
+"you report."
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/bin/apport-cli.py:251
+#: ../kde/apport-kde.py:434 ../bin/apport-cli.py:251
+#: ../debian/tmp/usr/share/apport/apport-kde.py:434
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15
+msgid "Uploading problem information"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:17 ../kde/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17
+msgid ""
+"The collected information is being sent to the bug tracking system. This "
+"might take a few minutes."
+msgstr ""
+
+#: ../data/apportcheckresume.py:73
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
+msgid ""
+"This occured during a previous suspend and prevented it from resuming "
+"properly."
+msgstr ""
+
+#: ../data/apportcheckresume.py:75
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
+msgid ""
+"This occured during a previous hibernate and prevented it from resuming "
+"properly."
+msgstr ""
+
+#: ../data/apportcheckresume.py:80
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80
+msgid ""
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81
+msgid "What would you like to do? Your options are:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85
+#, python-format
+msgid "Please choose (%s):"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148
+#, python-format
+msgid "(%i bytes)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:150 ../kde/apport-kde.py:362
+#: ../bin/apport-cli.py:150 ../gtk/apport-gtk.py:142
+#: ../debian/tmp/usr/share/apport/apport-kde.py:362
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:142
+msgid "(binary data)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:178 ../kde/apport-kde.py:185
+#: ../bin/apport-cli.py:178 ../gtk/apport-gtk.py:177
+#: ../debian/tmp/usr/share/apport/apport-kde.py:185
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:177
 msgid "Send problem report to the developers?"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437
-#: ../debian/tmp/usr/share/apport/apport-kde.py:177
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 ../kde/apport-kde.py:177
-#: ../gtk/apport-gtk.py:186
+#: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179
+msgid ""
+"After the problem report has been sent, please fill out the form in the\n"
+"automatically opened web browser."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182
+#, python-format
+msgid "&Send report (%s)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186
+msgid "&Examine locally"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190
+msgid "&View report"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191
+msgid "&Keep report file for sending later or copying to somewhere else"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192
+msgid "Cancel and &ignore future crashes of this program version"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:194
+#: ../debian/tmp/usr/bin/apport-cli.py:271
+#: ../debian/tmp/usr/bin/apport-cli.py:303
+#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194
+#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324
+msgid "&Cancel"
+msgstr "&Părahăşla"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222
+msgid "Problem report file:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:228
+#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228
+#: ../bin/apport-cli.py:233
+msgid "&Confirm"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232
+#, python-format
+msgid "Error: %s"
+msgstr "Jănăš: %s"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:238 ../kde/apport-kde.py:406
+#: ../bin/apport-cli.py:238 ../debian/tmp/usr/share/apport/apport-kde.py:406
+msgid "Collecting problem information"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239
+msgid ""
+"The collected information can be sent to the developers to improve the\n"
+"application. This might take a few minutes."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252
+msgid ""
+"The collected information is being sent to the bug tracking system.\n"
+"This might take a few minutes."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302
+msgid "&Done"
+msgstr "&Hatĕr"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308
+msgid "none"
+msgstr "şuk"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309
+#, python-format
+msgid "Selected: %s. Multiple choices:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325
+msgid "Choices:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339
+msgid "Path to file (Enter to cancel):"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345
+msgid "File does not exist."
+msgstr "Fajl tupănmarĕ"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347
+msgid "This is a directory."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353
+msgid "To continue, you must visit the following URL:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355
+msgid ""
+"You can launch a browser now, or copy this URL into a browser on another "
+"computer."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357
+msgid "Launch a browser now"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
+msgid "No pending crash reports. Try --help for more information."
+msgstr ""
+
+#: ../kde/apport-kde.py:193 ../gtk/apport-gtk.py:186
+#: ../debian/tmp/usr/share/apport/apport-kde.py:193
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:186
 msgid "Send"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300
-#: ../debian/tmp/usr/share/apport/apport-kde.py:183
-#: ../debian/tmp/usr/share/apport/apport-kde.py:224
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 ../kde/apport-kde.py:183
-#: ../kde/apport-kde.py:224 ../gtk/apport-gtk.py:165
+#: ../kde/apport-kde.py:199 ../kde/apport-kde.py:237 ../gtk/apport-gtk.py:165
+#: ../debian/tmp/usr/share/apport/apport-kde.py:199
+#: ../debian/tmp/usr/share/apport/apport-kde.py:237
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:165
 #, python-format
 msgid "Sorry, %s has experienced an internal error."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:191
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:191
-#: ../gtk/apport-gtk.py:257
+#: ../kde/apport-kde.py:207 ../gtk/apport-gtk.py:257
+#: ../debian/tmp/usr/share/apport/apport-kde.py:207
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:257
 #, python-format
 msgid "Package: %s"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137
-#: ../debian/tmp/usr/share/apport/apport-kde.py:197
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 ../kde/apport-kde.py:197
-#: ../gtk/apport-gtk.py:264
+#: ../kde/apport-kde.py:213 ../gtk/apport-gtk.py:264
+#: ../debian/tmp/usr/share/apport/apport-kde.py:213
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:264
 msgid "Sorry, a problem occurred while installing software."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:204
+#: ../kde/apport-kde.py:219 ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292
+#: ../debian/tmp/usr/share/apport/apport-kde.py:219
 #: ../debian/tmp/usr/share/apport/apport-gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:204
-#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:292
 #, python-format
 msgid "The application %s has experienced an internal error."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:208
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:208
-#: ../gtk/apport-gtk.py:276
+#: ../kde/apport-kde.py:222 ../gtk/apport-gtk.py:276
+#: ../debian/tmp/usr/share/apport/apport-kde.py:222
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:276
 #, python-format
 msgid "The application %s has closed unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479
-#: ../debian/tmp/usr/share/apport/apport-kde.py:217
-#: ../debian/tmp/usr/share/apport/apport-kde.py:230
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:216
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 ../kde/apport-kde.py:217
-#: ../kde/apport-kde.py:230 ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284
-#: ../gtk/apport-gtk.py:303 ../gtk/apport-gtk.ui.h:10
-msgid "Continue"
+#: ../kde/apport-kde.py:234 ../kde/apport-kde.py:380 ../gtk/apport-gtk.py:229
+#: ../gtk/apport-gtk.py:288 ../debian/tmp/usr/share/apport/apport-kde.py:234
+#: ../debian/tmp/usr/share/apport/apport-kde.py:380
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:288
+msgid "Relaunch"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:220
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 ../kde/apport-kde.py:220
-#: ../gtk/apport-gtk.py:287 ../gtk/apport-gtk.ui.h:9
-msgid "Leave Closed"
+#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:304
+#: ../debian/tmp/usr/share/apport/apport-kde.py:244
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:304
+msgid "Ignore future problems of this type"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-kde.py:221
-#: ../debian/tmp/usr/share/apport/apport-kde.py:368
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 ../kde/apport-kde.py:221
-#: ../kde/apport-kde.py:368 ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288
-msgid "Relaunch"
+#: ../kde/apport-kde.py:288 ../gtk/apport-gtk.py:577
+#: ../debian/tmp/usr/share/apport/apport-kde.py:288
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:577
+msgid "Hide Details"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342
-#: ../debian/tmp/usr/share/apport/apport-kde.py:227
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:227
-#: ../gtk/apport-gtk.py:300 ../gtk/apport-gtk.ui.h:4
-msgid "If you notice further problems, try restarting the computer."
+#: ../kde/apport-kde.py:314 ../debian/tmp/usr/share/apport/apport-kde.py:314
+msgid "Username:"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:231
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:231
-#: ../gtk/apport-gtk.py:304
-msgid "Ignore future problems of this type"
+#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315
+msgid "Password:"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:275
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:275
-#: ../gtk/apport-gtk.py:577
-msgid "Hide Details"
+#: ../kde/apport-kde.py:405 ../debian/tmp/usr/share/apport/apport-kde.py:405
+msgid "Collecting Problem Information"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:278
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:278
-#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 ../gtk/apport-gtk.ui.h:7
-msgid "Show Details"
+#: ../kde/apport-kde.py:407 ../debian/tmp/usr/share/apport/apport-kde.py:407
+msgid ""
+"The collected information can be sent to the developers to improve the "
+"application. This might take a few minutes."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:301 ../kde/apport-kde.py:301
-msgid "Username:"
+#: ../kde/apport-kde.py:433 ../debian/tmp/usr/share/apport/apport-kde.py:433
+msgid "Uploading Problem Information"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:302 ../kde/apport-kde.py:302
-msgid "Password:"
+#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
+msgid "See man page for details."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:349
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:349
-#: ../gtk/apport-gtk.py:142 ../bin/apport-cli.py:150
-#: ../debian/tmp/usr/bin/apport-cli.py:150
-msgid "(binary data)"
+#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:393 ../kde/apport-kde.py:393
-msgid "Collecting Problem Information"
+#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
+msgid ""
+"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
+"create it"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:394 ../kde/apport-kde.py:394
-#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238
-msgid "Collecting problem information"
+#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
+msgid ""
+"do  not  create  or reuse a sandbox directory for additional debug symbols "
+"but rely only on installed debug symbols."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:395 ../kde/apport-kde.py:395
+#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
 msgid ""
-"The collected information can be sent to the developers to improve the "
-"application. This might take a few minutes."
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:421 ../kde/apport-kde.py:421
-msgid "Uploading Problem Information"
+#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+msgid ""
+"report download/install progress when installing packages into sandbox"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:422
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../kde/apport-kde.py:422
-#: ../bin/apport-cli.py:251 ../gtk/apport-gtk.ui.h:13
-#: ../debian/tmp/usr/bin/apport-cli.py:251
-msgid "Uploading problem information"
+#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
+msgid ""
+"the executable that is run under valgrind's memcheck tool  for memory leak "
+"detection"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:423
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../kde/apport-kde.py:423
-#: ../gtk/apport-gtk.ui.h:15
+#: ../bin/apport-valgrind.py:66 ../bin/apport-retrace.py:61
+#: ../debian/tmp/usr/bin/apport-retrace.py:61
+#: ../debian/tmp/usr/bin/apport-valgrind.py:66
 msgid ""
-"The collected information is being sent to the bug tracking system. This "
-"might take a few minutes."
+"Install an extra package into the sandbox (can be specified multiple times)"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:457
-#: ../debian/tmp/usr/share/apport/apport-kde.py:493
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../kde/apport-kde.py:457
-#: ../kde/apport-kde.py:493 ../gtk/apport-gtk.ui.h:1
-msgid "Apport"
+#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#, python-format
+msgid "Error: %s is not an executable. Stopping."
+msgstr ""
+
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr ""
+
+#: ../data/kernel_oops.py:30 ../debian/tmp/usr/share/apport/kernel_oops.py:30
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr ""
+
+#: ../kde/apport-kde-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
+#: ../gtk/apport-gtk.desktop.in.h:1
+msgid "Report a problem..."
+msgstr ""
+
+#: ../kde/apport-kde-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
+#: ../gtk/apport-gtk.desktop.in.h:2
+msgid "Report a malfunction to the developers"
 msgstr ""
 
 #: ../apport/ui.py:124
@@ -241,9 +460,9 @@
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr ""
 
-#: ../apport/ui.py:272 ../apport/ui.py:1298
+#: ../apport/ui.py:272 ../apport/ui.py:1308
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1298
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1308
 #, python-format
 msgid "Problem in %s"
 msgstr ""
@@ -255,19 +474,17 @@
 "problem and send a report to the developers."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049
 #: ../apport/ui.py:321 ../apport/ui.py:329 ../apport/ui.py:456
-#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1104
-#: ../apport/ui.py:1270 ../apport/ui.py:1274
+#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1114
+#: ../apport/ui.py:1280 ../apport/ui.py:1284
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:321
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:329
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:456
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:459
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:660
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1104
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1274
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1114
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1280
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1284
 msgid "Invalid problem report"
 msgstr ""
 
@@ -490,106 +707,107 @@
 msgid "Print the Apport version number."
 msgstr ""
 
-#: ../apport/ui.py:889
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889
+#: ../apport/ui.py:888
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:888
 msgid ""
 "This will launch apport-retrace in a terminal window to examine the crash."
 msgstr ""
 
-#: ../apport/ui.py:890
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890
+#: ../apport/ui.py:889
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889
 msgid "Run gdb session"
 msgstr ""
 
-#: ../apport/ui.py:891
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:891
+#: ../apport/ui.py:890
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890
 msgid "Run gdb session without downloading debug symbols"
 msgstr ""
 
 #. TRANSLATORS: %s contains the crash report file name
-#: ../apport/ui.py:893
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:893
+#: ../apport/ui.py:892
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:892
 #, python-format
 msgid "Update %s with fully symbolic stack trace"
 msgstr ""
 
-#: ../apport/ui.py:969 ../apport/ui.py:979
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:969
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:979
+#: ../apport/ui.py:968 ../apport/ui.py:978
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:968
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:978
 msgid ""
 "This problem report applies to a program which is not installed any more."
 msgstr ""
 
-#: ../apport/ui.py:994
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:994
+#: ../apport/ui.py:993
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:993
 #, python-format
 msgid ""
 "The problem happened with the program %s which changed since the crash "
 "occurred."
 msgstr ""
 
-#: ../apport/ui.py:1036 ../apport/ui.py:1276
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1036
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276
+#: ../apport/ui.py:1040 ../apport/ui.py:1071 ../apport/ui.py:1286
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1040
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1071
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1286
 msgid "This problem report is damaged and cannot be processed."
 msgstr ""
 
 #. package does not exist
-#: ../apport/ui.py:1039
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1039
+#: ../apport/ui.py:1043
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1043
 msgid "The report belongs to a package that is not installed."
 msgstr ""
 
-#: ../apport/ui.py:1042
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1042
+#: ../apport/ui.py:1046
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1046
 msgid "An error occurred while attempting to process this problem report:"
 msgstr ""
 
-#: ../apport/ui.py:1105
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1105
+#: ../apport/ui.py:1115
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1115
 msgid "Could not determine the package or source package name."
 msgstr ""
 
-#: ../apport/ui.py:1123
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1123
+#: ../apport/ui.py:1133
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1133
 msgid "Unable to start web browser"
 msgstr ""
 
-#: ../apport/ui.py:1124
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1124
+#: ../apport/ui.py:1134
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1134
 #, python-format
 msgid "Unable to start web browser to open %s."
 msgstr ""
 
-#: ../apport/ui.py:1224
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1224
+#: ../apport/ui.py:1234
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1234
 #, python-format
 msgid "Please enter your account information for the %s bug tracking system"
 msgstr ""
 
-#: ../apport/ui.py:1236
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1236
+#: ../apport/ui.py:1246
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1246
 msgid "Network problem"
 msgstr "Tetel jănăšĕ"
 
-#: ../apport/ui.py:1238
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1238
+#: ../apport/ui.py:1248
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1248
 msgid ""
 "Cannot connect to crash database, please check your Internet connection."
 msgstr ""
 
-#: ../apport/ui.py:1265
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1265
+#: ../apport/ui.py:1275
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275
 msgid "Memory exhaustion"
 msgstr ""
 
-#: ../apport/ui.py:1266
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1266
+#: ../apport/ui.py:1276
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276
 msgid "Your system does not have enough memory to process this crash report."
 msgstr ""
 
-#: ../apport/ui.py:1301
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1301
+#: ../apport/ui.py:1311
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1311
 #, python-format
 msgid ""
 "The problem cannot be reported:\n"
@@ -597,352 +815,65 @@
 "%s"
 msgstr ""
 
-#: ../apport/ui.py:1357 ../apport/ui.py:1364
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1357
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1364
+#: ../apport/ui.py:1367 ../apport/ui.py:1374
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1367
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1374
 msgid "Problem already known"
 msgstr ""
 
-#: ../apport/ui.py:1358
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1358
+#: ../apport/ui.py:1368
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1368
 msgid ""
 "This problem was already reported in the bug report displayed in the web "
 "browser. Please check if you can add any further information that might be "
 "helpful for the developers."
 msgstr ""
 
-#: ../apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1365
+#: ../apport/ui.py:1375
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1375
 msgid "This problem was already reported to developers. Thank you!"
 msgstr ""
 
-#: ../data/apportcheckresume.py:73
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
-msgid ""
-"This occured during a previous suspend and prevented it from resuming "
-"properly."
-msgstr ""
-
-#: ../data/apportcheckresume.py:75
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
-msgid ""
-"This occured during a previous hibernate and prevented it from resuming "
-"properly."
-msgstr ""
-
-#: ../data/apportcheckresume.py:80
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80
-msgid ""
-"The resume processing hung very near the end and will have appeared to have "
-"completed normally."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2
-msgid "Crash report"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3
-msgid "<big><b>Sorry, an internal error happened.</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5
-msgid "Send an error report to help fix this problem"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
-msgid "Ignore future problems of this program version"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8
-msgid "_Examine locally"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12
-msgid ""
-"Information is being collected that may help the developers fix the problem "
-"you report."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37
-msgid "See man page for details."
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46
-msgid ""
-"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
-"create it"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50
-msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54
-msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58
-msgid ""
-"report download/install progress when installing packages into sandbox"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62
-msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:59
-#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-valgrind.py:66
-msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97
-#, python-format
-msgid "Error: %s is not an executable. Stopping."
-msgstr ""
-
-#: ../bin/apport-cli.py:74 ../debian/tmp/usr/bin/apport-cli.py:74
-msgid "Press any key to continue..."
-msgstr ""
-
-#: ../bin/apport-cli.py:81 ../debian/tmp/usr/bin/apport-cli.py:81
-msgid "What would you like to do? Your options are:"
-msgstr ""
-
-#: ../bin/apport-cli.py:85 ../debian/tmp/usr/bin/apport-cli.py:85
-#, python-format
-msgid "Please choose (%s):"
-msgstr ""
-
-#: ../bin/apport-cli.py:148 ../debian/tmp/usr/bin/apport-cli.py:148
-#, python-format
-msgid "(%i bytes)"
-msgstr ""
-
-#: ../bin/apport-cli.py:179 ../debian/tmp/usr/bin/apport-cli.py:179
-msgid ""
-"After the problem report has been sent, please fill out the form in the\n"
-"automatically opened web browser."
-msgstr ""
-
-#: ../bin/apport-cli.py:182 ../debian/tmp/usr/bin/apport-cli.py:182
-#, python-format
-msgid "&Send report (%s)"
-msgstr ""
-
-#: ../bin/apport-cli.py:186 ../debian/tmp/usr/bin/apport-cli.py:186
-msgid "&Examine locally"
-msgstr ""
-
-#: ../bin/apport-cli.py:190 ../debian/tmp/usr/bin/apport-cli.py:190
-msgid "&View report"
-msgstr ""
-
-#: ../bin/apport-cli.py:191 ../debian/tmp/usr/bin/apport-cli.py:191
-msgid "&Keep report file for sending later or copying to somewhere else"
-msgstr ""
-
-#: ../bin/apport-cli.py:192 ../debian/tmp/usr/bin/apport-cli.py:192
-msgid "Cancel and &ignore future crashes of this program version"
-msgstr ""
-
-#: ../bin/apport-cli.py:194 ../bin/apport-cli.py:271 ../bin/apport-cli.py:303
-#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:194
-#: ../debian/tmp/usr/bin/apport-cli.py:271
-#: ../debian/tmp/usr/bin/apport-cli.py:303
-#: ../debian/tmp/usr/bin/apport-cli.py:324
-msgid "&Cancel"
-msgstr "&Părahăşla"
-
-#: ../bin/apport-cli.py:222 ../debian/tmp/usr/bin/apport-cli.py:222
-msgid "Problem report file:"
-msgstr ""
-
-#: ../bin/apport-cli.py:228 ../bin/apport-cli.py:233
-#: ../debian/tmp/usr/bin/apport-cli.py:228
-#: ../debian/tmp/usr/bin/apport-cli.py:233
-msgid "&Confirm"
-msgstr ""
-
-#: ../bin/apport-cli.py:232 ../debian/tmp/usr/bin/apport-cli.py:232
-#, python-format
-msgid "Error: %s"
-msgstr "Jănăš: %s"
-
-#: ../bin/apport-cli.py:239 ../debian/tmp/usr/bin/apport-cli.py:239
-msgid ""
-"The collected information can be sent to the developers to improve the\n"
-"application. This might take a few minutes."
-msgstr ""
-
-#: ../bin/apport-cli.py:252 ../debian/tmp/usr/bin/apport-cli.py:252
-msgid ""
-"The collected information is being sent to the bug tracking system.\n"
-"This might take a few minutes."
-msgstr ""
-
-#: ../bin/apport-cli.py:302 ../debian/tmp/usr/bin/apport-cli.py:302
-msgid "&Done"
-msgstr "&Hatĕr"
-
-#: ../bin/apport-cli.py:308 ../debian/tmp/usr/bin/apport-cli.py:308
-msgid "none"
-msgstr "şuk"
-
-#: ../bin/apport-cli.py:309 ../debian/tmp/usr/bin/apport-cli.py:309
-#, python-format
-msgid "Selected: %s. Multiple choices:"
-msgstr ""
-
-#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325
-msgid "Choices:"
-msgstr ""
-
-#: ../bin/apport-cli.py:339 ../debian/tmp/usr/bin/apport-cli.py:339
-msgid "Path to file (Enter to cancel):"
-msgstr ""
-
-#: ../bin/apport-cli.py:345 ../debian/tmp/usr/bin/apport-cli.py:345
-msgid "File does not exist."
-msgstr "Fajl tupănmarĕ"
-
-#: ../bin/apport-cli.py:347 ../debian/tmp/usr/bin/apport-cli.py:347
-msgid "This is a directory."
-msgstr ""
-
-#: ../bin/apport-cli.py:353 ../debian/tmp/usr/bin/apport-cli.py:353
-msgid "To continue, you must visit the following URL:"
-msgstr ""
-
-#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355
-msgid ""
-"You can launch a browser now, or copy this URL into a browser on another "
-"computer."
-msgstr ""
-
-#: ../bin/apport-cli.py:357 ../debian/tmp/usr/bin/apport-cli.py:357
-msgid "Launch a browser now"
-msgstr ""
-
-#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371
-msgid "No pending crash reports. Try --help for more information."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
-msgid "Package: apport 1.2.3~0ubuntu1"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
-msgid "The application Apport has closed unexpectedly."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
-msgid "The application Apport has stopped responding."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
-msgid "You can wait to see if it wakes up, or close or relaunch it."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228
-msgid "Force Closed"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
-msgid "Sorry, the application apport has stopped unexpectedly."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
-msgid "Sorry, apport has closed unexpectedly."
-msgstr ""
-
-#: ../data/general-hooks/ubuntu.py:130
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130
-msgid ""
-"An Ubuntu package has a file conflict with a package that is not a genuine "
-"Ubuntu package"
-msgstr ""
-
-#: ../data/general-hooks/ubuntu.py:147
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147
-msgid ""
-"Your system was initially configured with grub version 2, but you have "
-"removed it from your system in favor of grub 1 without configuring it.  To "
-"ensure your bootloader configuration is updated whenever a new kernel is "
-"available, open a terminal and run:\n"
-"\n"
-"      sudo apt-get install grub-pc\n"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
-msgid "Problem in bash"
-msgstr ""
-
 #: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31
 msgid "%prog [options] <apport problem report | crash ID>"
 msgstr ""
 
-#: ../bin/apport-retrace.py:33 ../debian/tmp/usr/bin/apport-retrace.py:33
+#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34
 msgid "Do not put the new traces into the report, but write them to stdout."
 msgstr ""
 
-#: ../bin/apport-retrace.py:35 ../debian/tmp/usr/bin/apport-retrace.py:35
+#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36
 msgid ""
 "Start an interactive gdb session with the report's core dump (-o ignored; "
 "does not rewrite report)"
 msgstr ""
 
-#: ../bin/apport-retrace.py:37 ../debian/tmp/usr/bin/apport-retrace.py:37
+#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38
 msgid ""
 "Write modified report to given file instead of changing the original report"
 msgstr ""
 
-#: ../bin/apport-retrace.py:39 ../debian/tmp/usr/bin/apport-retrace.py:39
+#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
 msgid "Remove the core dump from the report after stack trace regeneration"
 msgstr ""
 
-#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
+#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
 msgid "Override report's CoreFile"
 msgstr ""
 
-#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
+#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
 msgid "Override report's ExecutablePath"
 msgstr ""
 
-#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
+#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
 msgid "Override report's ProcMaps"
 msgstr ""
 
-#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
+#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
 msgid "Rebuild report's Package information"
 msgstr ""
 
-#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
+#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
 msgid ""
 "Build a temporary sandbox and download/install the necessary packages and "
 "debug symbols in there; without this option it assumes that the necessary "
@@ -952,39 +883,39 @@
 "be able to retrace crashes that happened on the currently running release."
 msgstr ""
 
-#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
+#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
 msgid ""
 "Report download/install progress when installing packages into sandbox"
 msgstr ""
 
-#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
+#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
 msgid "Prepend timestamps to log messages, for batch operation"
 msgstr ""
 
-#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
+#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
 msgid "Cache directory for packages downloaded in the sandbox"
 msgstr ""
 
-#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
+#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59
 msgid ""
 "Directory for unpacked packages. Future runs will assume that any already "
 "downloaded package is also extracted to this sandbox."
 msgstr ""
 
-#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61
+#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
 msgid ""
 "Path to a file with the crash database authentication information. This is "
 "used when specifying a crash ID to upload the retraced stack traces (only if "
 "neither -g, -o, nor -s are specified)"
 msgstr ""
 
-#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
+#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65
 msgid ""
 "Display retraced stack traces and ask for confirmation before sending them "
 "to the crash database."
 msgstr ""
 
-#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65
+#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67
 msgid ""
 "Path to the duplicate sqlite database (default: no duplicate checking)"
 msgstr ""
@@ -1004,72 +935,110 @@
 msgstr ""
 
 #. translators: don't translate y/n, apport currently only checks for "y"
-#: ../bin/apport-retrace.py:114 ../debian/tmp/usr/bin/apport-retrace.py:114
+#: ../bin/apport-retrace.py:109 ../debian/tmp/usr/bin/apport-retrace.py:109
 msgid "OK to send these as attachments? [y/n]"
 msgstr ""
 
-#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
-msgid "Report a problem..."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
+msgid "Package: apport 1.2.3~0ubuntu1"
 msgstr ""
 
-#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
-msgid "Report a malfunction to the developers"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
+msgid "The application Apport has closed unexpectedly."
 msgstr ""
 
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
+#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
+#, python-format
+msgid "Usage: %s <report> <target directory>"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:46 ../bin/apport-unpack.py:46
+msgid "Destination directory exists and is not empty."
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:2
+msgid ""
+"Authentication is required to collect system information for this problem "
+"report"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:4
+msgid ""
+"Please enter your password to access problem reports of system programs"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157
+#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157
 #, python-format
 msgid "Sorry, the application %s has stopped unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160
+#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160
 #, python-format
 msgid "Sorry, %s has closed unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238
+#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228
+msgid "Force Closed"
+msgstr ""
+
+#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238
 #, python-format
 msgid "The application %s has stopped responding."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242
+#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242
 #, python-format
 msgid "The program \"%s\" has stopped responding."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30
-msgid "Your system might become unstable now and might need to be restarted."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
+msgid "Problem in bash"
 msgstr ""
 
-#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22
-#, python-format
-msgid "Usage: %s <report> <target directory>"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
+msgid "The application Apport has stopped responding."
 msgstr ""
 
-#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46
-msgid "Destination directory exists and is not empty."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
+msgid "You can wait to see if it wakes up, or close or relaunch it."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
+msgid "Sorry, the application apport has stopped unexpectedly."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:2
-msgid ""
-"Authentication is required to collect system information for this problem "
-"report"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
+msgid "Sorry, apport has closed unexpectedly."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:133
+#: ../data/general-hooks/ubuntu.py:133
+msgid ""
+"An Ubuntu package has a file conflict with a package that is not a genuine "
+"Ubuntu package"
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:4
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:150
+#: ../data/general-hooks/ubuntu.py:150
 msgid ""
-"Please enter your password to access problem reports of system programs"
+"Your system was initially configured with grub version 2, but you have "
+"removed it from your system in favor of grub 1 without configuring it.  To "
+"ensure your bootloader configuration is updated whenever a new kernel is "
+"available, open a terminal and run:\n"
+"\n"
+"      sudo apt-get install grub-pc\n"
 msgstr ""
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/apturl.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/apturl.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/apturl.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/apturl.po	2015-08-14 07:59:23.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:59+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:50+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../apturl-gtk:49 ../apturl-kde:52
 msgid "User requested interrupt."
@@ -123,20 +123,20 @@
 msgid "Enable additional components"
 msgstr ""
 
-#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:85 ../AptUrl/kde/KdeUI.py:80
+#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:103 ../AptUrl/kde/KdeUI.py:80
 msgid "Enable additional software channel"
 msgstr ""
 
-#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:86 ../AptUrl/kde/KdeUI.py:81
+#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:104 ../AptUrl/kde/KdeUI.py:81
 #, python-format
 msgid "Do you want to enable the following software channel: '%s'?"
 msgstr ""
 
-#: ../AptUrl/gtk/GtkUI.py:154 ../AptUrl/kde/KdeUI.py:133
+#: ../AptUrl/gtk/GtkUI.py:168 ../AptUrl/kde/KdeUI.py:133
 msgid "Install additional software?"
 msgstr ""
 
-#: ../AptUrl/gtk/GtkUI.py:155 ../AptUrl/kde/KdeUI.py:134
+#: ../AptUrl/gtk/GtkUI.py:169 ../AptUrl/kde/KdeUI.py:134
 #, python-format
 msgid "Do you want to install package '%s'?"
 msgstr ""
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/bootloader.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/bootloader.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/bootloader.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/bootloader.po	2015-08-14 07:59:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:12+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:16+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. ok button label
 #. txt_ok
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/cups.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/cups.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/cups.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/cups.po	2015-08-14 07:59:23.000000000 +0000
@@ -14,159 +14,159 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 14:14+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:01+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
-#: systemv/lpstat.c:1936 systemv/lpstat.c:2061
+#: systemv/lpstat.c:1867 systemv/lpstat.c:1990
 msgid "\t\t(all)"
 msgstr ""
 
-#: systemv/lpstat.c:1939 systemv/lpstat.c:1942 systemv/lpstat.c:2064
-#: systemv/lpstat.c:2067
+#: systemv/lpstat.c:1870 systemv/lpstat.c:1873 systemv/lpstat.c:1993
+#: systemv/lpstat.c:1996
 msgid "\t\t(none)"
 msgstr ""
 
-#: berkeley/lpc.c:434
+#: berkeley/lpc.c:426
 #, c-format
 msgid "\t%d entries"
 msgstr ""
 
-#: systemv/lpstat.c:785 systemv/lpstat.c:801
+#: systemv/lpstat.c:783 systemv/lpstat.c:799
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: systemv/lpstat.c:1917 systemv/lpstat.c:2042
+#: systemv/lpstat.c:1848 systemv/lpstat.c:1971
 msgid "\tAfter fault: continue"
 msgstr ""
 
-#: systemv/lpstat.c:1535 systemv/lpstat.c:1886 systemv/lpstat.c:2012
+#: systemv/lpstat.c:1471 systemv/lpstat.c:1817 systemv/lpstat.c:1941
 #, c-format
 msgid "\tAlerts: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1940 systemv/lpstat.c:2065
+#: systemv/lpstat.c:1871 systemv/lpstat.c:1994
 msgid "\tBanner required"
 msgstr ""
 
-#: systemv/lpstat.c:1941 systemv/lpstat.c:2066
+#: systemv/lpstat.c:1872 systemv/lpstat.c:1995
 msgid "\tCharset sets:"
 msgstr ""
 
-#: systemv/lpstat.c:1905 systemv/lpstat.c:2030
+#: systemv/lpstat.c:1836 systemv/lpstat.c:1959
 msgid "\tConnection: direct"
 msgstr ""
 
-#: systemv/lpstat.c:1896 systemv/lpstat.c:2022
+#: systemv/lpstat.c:1827 systemv/lpstat.c:1951
 msgid "\tConnection: remote"
 msgstr ""
 
-#: systemv/lpstat.c:1860 systemv/lpstat.c:1986
+#: systemv/lpstat.c:1793 systemv/lpstat.c:1917
 msgid "\tContent types: any"
 msgstr ""
 
-#: systemv/lpstat.c:1944 systemv/lpstat.c:2069
+#: systemv/lpstat.c:1875 systemv/lpstat.c:1998
 msgid "\tDefault page size:"
 msgstr ""
 
-#: systemv/lpstat.c:1943 systemv/lpstat.c:2068
+#: systemv/lpstat.c:1874 systemv/lpstat.c:1997
 msgid "\tDefault pitch:"
 msgstr ""
 
-#: systemv/lpstat.c:1945 systemv/lpstat.c:2070
+#: systemv/lpstat.c:1876 systemv/lpstat.c:1999
 msgid "\tDefault port settings:"
 msgstr ""
 
-#: systemv/lpstat.c:1866 systemv/lpstat.c:1992
+#: systemv/lpstat.c:1799 systemv/lpstat.c:1923
 #, c-format
 msgid "\tDescription: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1859 systemv/lpstat.c:1985
+#: systemv/lpstat.c:1792 systemv/lpstat.c:1916
 msgid "\tForm mounted:"
 msgstr ""
 
-#: systemv/lpstat.c:1938 systemv/lpstat.c:2063
+#: systemv/lpstat.c:1869 systemv/lpstat.c:1992
 msgid "\tForms allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1900 systemv/lpstat.c:2026
+#: systemv/lpstat.c:1831 systemv/lpstat.c:1955
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1909 systemv/lpstat.c:2034
+#: systemv/lpstat.c:1840 systemv/lpstat.c:1963
 #, c-format
 msgid "\tInterface: %s/interfaces/%s"
 msgstr ""
 
-#: systemv/lpstat.c:1913 systemv/lpstat.c:2038
+#: systemv/lpstat.c:1844 systemv/lpstat.c:1967
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1891 systemv/lpstat.c:2017
+#: systemv/lpstat.c:1822 systemv/lpstat.c:1946
 #, c-format
 msgid "\tLocation: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1916 systemv/lpstat.c:2041
+#: systemv/lpstat.c:1847 systemv/lpstat.c:1970
 msgid "\tOn fault: no alert"
 msgstr ""
 
-#: systemv/lpstat.c:1861 systemv/lpstat.c:1987
+#: systemv/lpstat.c:1794 systemv/lpstat.c:1918
 msgid "\tPrinter types: unknown"
 msgstr ""
 
-#: systemv/lpstat.c:1516
+#: systemv/lpstat.c:1454
 #, c-format
 msgid "\tStatus: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1921 systemv/lpstat.c:1935 systemv/lpstat.c:2046
-#: systemv/lpstat.c:2060
+#: systemv/lpstat.c:1852 systemv/lpstat.c:1866 systemv/lpstat.c:1975
+#: systemv/lpstat.c:1989
 msgid "\tUsers allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1928 systemv/lpstat.c:2053
+#: systemv/lpstat.c:1859 systemv/lpstat.c:1982
 msgid "\tUsers denied:"
 msgstr ""
 
-#: berkeley/lpc.c:436
+#: berkeley/lpc.c:428
 msgid "\tdaemon present"
 msgstr ""
 
-#: berkeley/lpc.c:432
+#: berkeley/lpc.c:424
 msgid "\tno entries"
 msgstr ""
 
-#: berkeley/lpc.c:404 berkeley/lpc.c:416
+#: berkeley/lpc.c:396 berkeley/lpc.c:408
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr ""
 
-#: berkeley/lpc.c:429
+#: berkeley/lpc.c:421
 msgid "\tprinting is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:427
+#: berkeley/lpc.c:419
 msgid "\tprinting is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1538
+#: systemv/lpstat.c:1474
 #, c-format
 msgid "\tqueued for %s"
 msgstr ""
 
-#: berkeley/lpc.c:424
+#: berkeley/lpc.c:416
 msgid "\tqueuing is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:422
+#: berkeley/lpc.c:414
 msgid "\tqueuing is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1852 systemv/lpstat.c:1978
+#: systemv/lpstat.c:1785 systemv/lpstat.c:1909
 msgid "\treason unknown"
 msgstr ""
 
@@ -228,7 +228,7 @@
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr ""
 
-#: berkeley/lpq.c:559
+#: berkeley/lpq.c:528
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr ""
@@ -963,11 +963,11 @@
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr ""
 
-#: test/ippfind.c:2776
+#: test/ippfind.c:2788
 msgid "  ! expression            Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2775
+#: test/ippfind.c:2787
 msgid "  ( expressions )         Group expressions."
 msgstr ""
 
@@ -991,117 +991,117 @@
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
-#: ppdc/ppdc.cxx:455
+#: ppdc/ppdc.cxx:450
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:457
+#: ppdc/ppdc.cxx:452
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: test/ippfind.c:2757
+#: test/ippfind.c:2769
 msgid "  --domain regex          Match domain to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2758
+#: test/ippfind.c:2770
 msgid ""
 "  --exec utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: test/ippfind.c:2778
+#: test/ippfind.c:2790
 msgid "  --false                 Always false."
 msgstr ""
 
-#: test/ippfind.c:2740
+#: test/ippfind.c:2752
 msgid "  --help                  Show this help."
 msgstr ""
 
-#: test/ippfind.c:2760
+#: test/ippfind.c:2772
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
-#: ppdc/ppdc.cxx:459
+#: ppdc/ppdc.cxx:454
 msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr ""
 
-#: test/ippfind.c:2762
+#: test/ippfind.c:2774
 msgid "  --local                 True if service is local."
 msgstr ""
 
-#: test/ippfind.c:2761
+#: test/ippfind.c:2773
 msgid "  --ls                    List attributes."
 msgstr ""
 
-#: test/ippfind.c:2763
+#: test/ippfind.c:2775
 msgid "  --name regex            Match service name to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2777
+#: test/ippfind.c:2789
 msgid "  --not expression        Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2764
+#: test/ippfind.c:2776
 msgid "  --path regex            Match resource path to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2765
+#: test/ippfind.c:2777
 msgid "  --port number[-number]  Match port to number or range."
 msgstr ""
 
-#: test/ippfind.c:2766
+#: test/ippfind.c:2778
 msgid "  --print                 Print URI if true."
 msgstr ""
 
-#: test/ippfind.c:2767
+#: test/ippfind.c:2779
 msgid "  --print-name            Print service name if true."
 msgstr ""
 
-#: test/ippfind.c:2768
+#: test/ippfind.c:2780
 msgid "  --quiet                 Quietly report match via exit code."
 msgstr ""
 
-#: test/ippfind.c:2769
+#: test/ippfind.c:2781
 msgid "  --remote                True if service is remote."
 msgstr ""
 
-#: test/ippfind.c:2779
+#: test/ippfind.c:2791
 msgid "  --true                  Always true."
 msgstr ""
 
-#: test/ippfind.c:2770
+#: test/ippfind.c:2782
 msgid "  --txt key               True if the TXT record contains the key."
 msgstr ""
 
-#: test/ippfind.c:2771
+#: test/ippfind.c:2783
 msgid "  --txt-* regex           Match TXT record key to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2772
+#: test/ippfind.c:2784
 msgid "  --uri regex             Match URI to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2741
+#: test/ippfind.c:2753
 msgid "  --version               Show program version."
 msgstr ""
 
-#: test/ippfind.c:2734 test/ipptool.c:4709
+#: test/ippfind.c:2746 test/ipptool.c:4810
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ippfind.c:2735 test/ipptool.c:4710
+#: test/ippfind.c:2747 test/ipptool.c:4811
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:4711
+#: test/ipptool.c:4812
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1458
+#: scheduler/cupsfilter.c:1484
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
-#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
+#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
@@ -1109,11 +1109,11 @@
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:4713
+#: test/ipptool.c:4814
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2005
+#: scheduler/main.c:2149
 msgid ""
 "  -F                      Run in the foreground but detach from console."
 msgstr ""
@@ -1122,11 +1122,11 @@
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:4715
+#: test/ipptool.c:4816
 msgid "  -I                      Ignore errors."
 msgstr ""
 
-#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
+#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
@@ -1134,15 +1134,15 @@
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: test/ipptool.c:4716
+#: test/ipptool.c:4817
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1460
+#: scheduler/cupsfilter.c:1485
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2744
+#: test/ippfind.c:2756
 msgid "  -P number[-number]      Match port to number or range."
 msgstr ""
 
@@ -1150,23 +1150,23 @@
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:4718
+#: test/ipptool.c:4820
 msgid "  -S                      Test with SSL encryption."
 msgstr ""
 
-#: test/ippfind.c:2736
+#: test/ippfind.c:2748
 msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
-#: test/ipptool.c:4720
+#: test/ipptool.c:4822
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1461 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
+#: scheduler/cupsfilter.c:1486 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ippfind.c:2738 test/ipptool.c:4722
+#: test/ippfind.c:2750 test/ipptool.c:4824
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
@@ -1176,7 +1176,7 @@
 "{all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:4724
+#: test/ipptool.c:4826
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
@@ -1188,15 +1188,15 @@
 msgid "  -a                      Export all printers."
 msgstr ""
 
-#: ppdc/ppdc.cxx:442
+#: ppdc/ppdc.cxx:437
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1462
+#: scheduler/cupsfilter.c:1487
 msgid "  -c cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: scheduler/main.c:2003
+#: scheduler/main.c:2147
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
@@ -1204,39 +1204,39 @@
 msgid "  -d domain               Browse/resolve in specified domain."
 msgstr ""
 
-#: test/ipptool.c:4726
+#: test/ipptool.c:4829
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
-#: ppdc/ppdc.cxx:444
+#: ppdc/ppdc.cxx:439
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1464
+#: scheduler/cupsfilter.c:1488
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: test/ippfind.c:2745
+#: test/ippfind.c:2757
 msgid "  -d regex                Match domain to regular expression."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1466
+#: scheduler/cupsfilter.c:1489
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2004
+#: scheduler/main.c:2148
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:4728
+#: test/ipptool.c:4831
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/main.c:2007
+#: scheduler/main.c:2151
 msgid "  -h                      Show this usage message."
 msgstr ""
 
-#: test/ippfind.c:2746
+#: test/ippfind.c:2758
 msgid "  -h regex                Match hostname to regular expression."
 msgstr ""
 
@@ -1244,52 +1244,52 @@
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1468
+#: scheduler/cupsfilter.c:1490
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:4730
+#: test/ipptool.c:4833
 msgid ""
 "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1470
+#: scheduler/cupsfilter.c:1491
 msgid ""
 "  -j job-id[,N]           Filter file N from the specified job (default is "
 "file 1)."
 msgstr ""
 
-#: test/ippfind.c:2747
+#: test/ippfind.c:2759
 msgid "  -l                      List attributes."
 msgstr ""
 
-#: scheduler/main.c:2008
+#: scheduler/main.c:2065
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:446
+#: ppdc/ppdc.cxx:441
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:448
+#: ppdc/ppdc.cxx:443
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1472
+#: scheduler/cupsfilter.c:1492
 msgid ""
 "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1474
+#: scheduler/cupsfilter.c:1493
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:4732
+#: test/ipptool.c:4836
 msgid ""
 "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: test/ippfind.c:2748
+#: test/ippfind.c:2760
 msgid "  -n regex                Match service name to regular expression."
 msgstr ""
 
@@ -1298,19 +1298,19 @@
 "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:370
+#: ppdc/ppdmerge.cxx:364
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1475
+#: scheduler/cupsfilter.c:1494
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: test/ippfind.c:2749
+#: test/ippfind.c:2761
 msgid "  -p                      Print URI if true."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1476
+#: scheduler/cupsfilter.c:1495
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
@@ -1318,15 +1318,15 @@
 msgid "  -p program              Run specified program for each service."
 msgstr ""
 
-#: test/ippfind.c:2750
+#: test/ippfind.c:2762
 msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
-#: systemv/cupstestppd.c:3826 test/ipptool.c:4734
+#: systemv/cupstestppd.c:3826 test/ipptool.c:4838
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: test/ippfind.c:2751
+#: test/ippfind.c:2763
 msgid "  -r                      True if service is remote."
 msgstr ""
 
@@ -1334,27 +1334,27 @@
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ippfind.c:2752
+#: test/ippfind.c:2764
 msgid "  -s                      Print service name if true."
 msgstr ""
 
-#: test/ipptool.c:4735
+#: test/ipptool.c:4839
 msgid "  -t                      Produce a test report."
 msgstr ""
 
-#: ppdc/ppdc.cxx:450
+#: ppdc/ppdc.cxx:445
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2009
+#: scheduler/main.c:2153
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: test/ippfind.c:2753
+#: test/ippfind.c:2765
 msgid "  -t key                  True if the TXT record contains the key."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1477
+#: scheduler/cupsfilter.c:1496
 msgid "  -t title                Set title."
 msgstr ""
 
@@ -1362,16 +1362,16 @@
 msgid "  -t type                 Browse/resolve with specified type."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1478
+#: scheduler/cupsfilter.c:1497
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: test/ippfind.c:2754
+#: test/ippfind.c:2766
 msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4736
-#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4840
+#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr ""
 
@@ -1379,99 +1379,99 @@
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: test/ippfind.c:2755
+#: test/ippfind.c:2767
 msgid ""
 "  -x utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: ppdc/ppdc.cxx:453
+#: ppdc/ppdc.cxx:448
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
-#: test/ippfind.c:2798
+#: test/ippfind.c:2810
 msgid "  IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: test/ippfind.c:2799
+#: test/ippfind.c:2811
 msgid ""
 "  IPPFIND_SERVICE_HOSTNAME\n"
 "                          Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2801
+#: test/ippfind.c:2813
 msgid "  IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2802
+#: test/ippfind.c:2814
 msgid "  IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: test/ippfind.c:2803
+#: test/ippfind.c:2815
 msgid "  IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2804
+#: test/ippfind.c:2816
 msgid "  IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2805
+#: test/ippfind.c:2817
 msgid "  IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: test/ippfind.c:2806
+#: test/ippfind.c:2818
 msgid "  IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2781
+#: test/ippfind.c:2793
 msgid ""
 "  expression --and expression\n"
 "                          Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2783
+#: test/ippfind.c:2795
 msgid ""
 "  expression --or expression\n"
 "                          Logical OR."
 msgstr ""
 
-#: test/ippfind.c:2780
+#: test/ippfind.c:2792
 msgid "  expression expression   Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2788
+#: test/ippfind.c:2800
 msgid "  {service_domain}        Domain name"
 msgstr ""
 
-#: test/ippfind.c:2789
+#: test/ippfind.c:2801
 msgid "  {service_hostname}      Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2790
+#: test/ippfind.c:2802
 msgid "  {service_name}          Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2791
+#: test/ippfind.c:2803
 msgid "  {service_port}          Port number"
 msgstr ""
 
-#: test/ippfind.c:2792
+#: test/ippfind.c:2804
 msgid "  {service_regtype}       DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2793
+#: test/ippfind.c:2805
 msgid "  {service_scheme}        URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2794
+#: test/ippfind.c:2806
 msgid "  {service_uri}           URI"
 msgstr ""
 
-#: test/ippfind.c:2795
+#: test/ippfind.c:2807
 msgid "  {txt_*}                 Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2787
+#: test/ippfind.c:2799
 msgid "  {}                      URI"
 msgstr ""
 
@@ -1536,282 +1536,282 @@
 msgid " PASS"
 msgstr ""
 
-#: cups/ipp.c:5254
+#: cups/ipp.c:5227
 #, c-format
 msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: cups/ipp.c:5265
+#: cups/ipp.c:5238
 #, c-format
 msgid ""
 "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: cups/ipp.c:4885
+#: cups/ipp.c:4858
 #, c-format
 msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:4877
+#: cups/ipp.c:4850
 #, c-format
 msgid ""
 "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:4903
+#: cups/ipp.c:4876
 #, c-format
 msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
 msgstr ""
 
-#: cups/ipp.c:5317
+#: cups/ipp.c:5290
 #, c-format
 msgid ""
 "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: cups/ipp.c:5326
+#: cups/ipp.c:5299
 #, c-format
 msgid ""
 "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: cups/ipp.c:5003
+#: cups/ipp.c:4976
 #, c-format
 msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:5011
+#: cups/ipp.c:4984
 #, c-format
 msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4995
+#: cups/ipp.c:4968
 #, c-format
 msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4955
+#: cups/ipp.c:4928
 #, c-format
 msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4987
+#: cups/ipp.c:4960
 #, c-format
 msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4963
+#: cups/ipp.c:4936
 #, c-format
 msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4971
+#: cups/ipp.c:4944
 #, c-format
 msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4947
+#: cups/ipp.c:4920
 #, c-format
 msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4979
+#: cups/ipp.c:4952
 #, c-format
 msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4917
+#: cups/ipp.c:4890
 #, c-format
 msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
 msgstr ""
 
-#: cups/ipp.c:5232
+#: cups/ipp.c:5205
 #, c-format
 msgid ""
 "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5223
+#: cups/ipp.c:5196
 #, c-format
 msgid ""
 "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
 "4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5426
+#: cups/ipp.c:5399
 #, c-format
 msgid ""
 "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
 "4.1.9)."
 msgstr ""
 
-#: cups/ipp.c:5436
+#: cups/ipp.c:5409
 #, c-format
 msgid ""
 "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
 "4.1.9)."
 msgstr ""
 
-#: cups/ipp.c:5194
+#: cups/ipp.c:5167
 #, c-format
 msgid ""
 "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5203
+#: cups/ipp.c:5176
 #, c-format
 msgid ""
 "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5372
+#: cups/ipp.c:5345
 #, c-format
 msgid ""
 "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
 "4.1.8)."
 msgstr ""
 
-#: cups/ipp.c:5382
+#: cups/ipp.c:5355
 #, c-format
 msgid ""
 "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
 "4.1.8)."
 msgstr ""
 
-#: cups/ipp.c:4931
+#: cups/ipp.c:4904
 #, c-format
 msgid ""
 "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
 msgstr ""
 
-#: cups/ipp.c:5074
+#: cups/ipp.c:5047
 #, c-format
 msgid ""
 "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
 "section 4.1.13)."
 msgstr ""
 
-#: cups/ipp.c:5055
+#: cups/ipp.c:5028
 #, c-format
 msgid ""
 "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
 "4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:5024
+#: cups/ipp.c:4997
 #, c-format
 msgid ""
 "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
 "positive (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:5039
+#: cups/ipp.c:5012
 #, c-format
 msgid ""
 "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
 "2911 section 4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:5136
+#: cups/ipp.c:5109
 #, c-format
 msgid ""
 "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: cups/ipp.c:5145
+#: cups/ipp.c:5118
 #, c-format
 msgid ""
 "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: cups/ipp.c:5288
+#: cups/ipp.c:5261
 #, c-format
 msgid ""
 "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: cups/ipp.c:5297
+#: cups/ipp.c:5270
 #, c-format
 msgid ""
 "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: berkeley/lpq.c:565
+#: berkeley/lpq.c:560
 #, c-format
 msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 msgstr ""
 
-#: berkeley/lpq.c:570
+#: berkeley/lpq.c:533
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
 
-#: systemv/lpstat.c:779
+#: systemv/lpstat.c:777
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr ""
 
-#: scheduler/ipp.c:9867
+#: scheduler/ipp.c:9952
 #, c-format
 msgid "%s cannot be changed."
 msgstr ""
 
-#: berkeley/lpc.c:189
+#: berkeley/lpc.c:181
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr ""
 
-#: berkeley/lpq.c:656
+#: berkeley/lpq.c:618
 #, c-format
 msgid "%s is not ready"
 msgstr ""
 
-#: berkeley/lpq.c:649
+#: berkeley/lpq.c:611
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: berkeley/lpq.c:652
+#: berkeley/lpq.c:614
 #, c-format
 msgid "%s is ready and printing"
 msgstr ""
 
-#: filter/rastertoepson.c:985 filter/rastertohp.c:711
-#: filter/rastertolabel.c:1128
+#: filter/rastertoepson.c:970 filter/rastertohp.c:700
+#: filter/rastertolabel.c:1120
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr ""
 
-#: systemv/lpstat.c:783
+#: systemv/lpstat.c:781
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr ""
 
-#: scheduler/ipp.c:621
+#: scheduler/ipp.c:618
 #, c-format
 msgid "%s not supported."
 msgstr ""
 
-#: systemv/lpstat.c:794
+#: systemv/lpstat.c:792
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr ""
 
-#: systemv/lpstat.c:799
+#: systemv/lpstat.c:797
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpq.c:557
+#: berkeley/lpq.c:526
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86 scheduler/cupsfilter.c:698 systemv/lpadmin.c:805
-#: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962
-#: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168
-#: systemv/lpadmin.c:1479
+#: cups/langprintf.c:77 scheduler/cupsfilter.c:726 systemv/lpadmin.c:791
+#: systemv/lpadmin.c:842 systemv/lpadmin.c:892 systemv/lpadmin.c:948
+#: systemv/lpadmin.c:1046 systemv/lpadmin.c:1098 systemv/lpadmin.c:1154
+#: systemv/lpadmin.c:1463
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -1821,7 +1821,7 @@
 msgid "%s: %s failed: %s"
 msgstr ""
 
-#: test/ippfind.c:797 test/ipptool.c:361
+#: test/ippfind.c:777 test/ipptool.c:378
 #, c-format
 msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
@@ -1831,111 +1831,111 @@
 msgid "%s: Don't know what to do."
 msgstr ""
 
-#: berkeley/lpq.c:237 berkeley/lpr.c:362 systemv/lp.c:608
+#: berkeley/lpq.c:225 berkeley/lpr.c:358 systemv/lp.c:602
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:144 berkeley/lpq.c:215 berkeley/lpr.c:234 berkeley/lpr.c:337
-#: systemv/lp.c:163 systemv/lp.c:583 systemv/lp.c:703 systemv/lp.c:752
+#: berkeley/lpq.c:133 berkeley/lpq.c:203 berkeley/lpr.c:230 berkeley/lpr.c:333
+#: systemv/lp.c:157 systemv/lp.c:577 systemv/lp.c:697 systemv/lp.c:746
 #: systemv/lpstat.c:195 systemv/lpstat.c:241 systemv/lpstat.c:332
 #: systemv/lpstat.c:361 systemv/lpstat.c:385 systemv/lpstat.c:444
-#: systemv/lpstat.c:510 systemv/lpstat.c:571 systemv/lpstat.c:697
-#: systemv/lpstat.c:882 systemv/lpstat.c:1143 systemv/lpstat.c:1386
-#: systemv/lpstat.c:1645
+#: systemv/lpstat.c:510 systemv/lpstat.c:571 systemv/lpstat.c:696
+#: systemv/lpstat.c:880 systemv/lpstat.c:1141 systemv/lpstat.c:1339
+#: systemv/lpstat.c:1579
 #, c-format
 msgid "%s: Error - add '/version=1.1' to server name."
 msgstr ""
 
-#: systemv/lp.c:240
+#: systemv/lp.c:234
 #, c-format
 msgid "%s: Error - bad job ID."
 msgstr ""
 
-#: systemv/lp.c:228
+#: systemv/lp.c:222
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
 msgstr ""
 
-#: systemv/lp.c:521
+#: systemv/lp.c:515
 #, c-format
 msgid ""
 "%s: Error - cannot print from stdin if files or a job ID are provided."
 msgstr ""
 
-#: systemv/lp.c:470
+#: systemv/lp.c:464
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr ""
 
-#: systemv/lp.c:489
+#: systemv/lp.c:483
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr ""
 
-#: berkeley/lpr.c:249
+#: berkeley/lpr.c:245
 #, c-format
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr ""
 
-#: systemv/lp.c:273
+#: systemv/lp.c:267
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr ""
 
-#: berkeley/lpr.c:210
+#: berkeley/lpr.c:206
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:138
+#: systemv/lp.c:132
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr ""
 
-#: systemv/lp.c:177
+#: systemv/lp.c:171
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr ""
 
-#: systemv/lp.c:400
+#: systemv/lp.c:394
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpr.c:104
+#: berkeley/lpr.c:100
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124
-#: systemv/cupsaccept.c:123 systemv/lp.c:198 systemv/lpstat.c:266
+#: berkeley/lpq.c:169 berkeley/lprm.c:123 systemv/cancel.c:124
+#: systemv/cupsaccept.c:123 systemv/lp.c:192 systemv/lpstat.c:266
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lp.c:380
+#: systemv/lp.c:374
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr ""
 
-#: berkeley/lpr.c:272
+#: berkeley/lpr.c:268
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr ""
 
-#: berkeley/lpr.c:154 systemv/lp.c:297
+#: berkeley/lpr.c:150 systemv/lp.c:291
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lp.c:450
+#: systemv/lp.c:444
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:317
+#: systemv/lp.c:311
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr ""
@@ -1945,14 +1945,14 @@
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr ""
 
-#: systemv/lp.c:363
+#: systemv/lp.c:357
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr ""
 
-#: berkeley/lpq.c:108 berkeley/lpr.c:85 berkeley/lprm.c:104
-#: systemv/cancel.c:95 systemv/cupsaccept.c:101 systemv/lp.c:116
-#: systemv/lpadmin.c:438 systemv/lpstat.c:124
+#: berkeley/lpq.c:97 berkeley/lpr.c:81 berkeley/lprm.c:104 systemv/cancel.c:95
+#: systemv/cupsaccept.c:101 systemv/lp.c:110 systemv/lpadmin.c:424
+#: systemv/lpstat.c:124
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr ""
@@ -1962,7 +1962,7 @@
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr ""
 
-#: berkeley/lpr.c:126
+#: berkeley/lpr.c:122
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr ""
@@ -1974,32 +1974,32 @@
 "option."
 msgstr ""
 
-#: berkeley/lpq.c:242 berkeley/lpr.c:367 systemv/lp.c:613
+#: berkeley/lpq.c:230 berkeley/lpr.c:363 systemv/lp.c:607
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr ""
 
-#: systemv/lp.c:339
+#: systemv/lp.c:333
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr ""
 
-#: berkeley/lpr.c:370 systemv/lp.c:616
+#: berkeley/lpr.c:366 systemv/lp.c:610
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr ""
 
-#: berkeley/lpr.c:315 systemv/lp.c:553
+#: berkeley/lpr.c:311 systemv/lp.c:547
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:297 systemv/lp.c:536
+#: berkeley/lpr.c:293 systemv/lp.c:530
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr ""
 
-#: berkeley/lpr.c:413 systemv/lp.c:647
+#: berkeley/lpr.c:409 systemv/lp.c:641
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr ""
@@ -2009,23 +2009,23 @@
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:148
+#: berkeley/lpq.c:137
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:283 berkeley/lprm.c:139 systemv/cancel.c:163
-#: systemv/cupsaccept.c:164 systemv/lp.c:512 systemv/lpstat.c:456
+#: berkeley/lpr.c:279 berkeley/lprm.c:139 systemv/cancel.c:163
+#: systemv/cupsaccept.c:164 systemv/lp.c:506 systemv/lpstat.c:456
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr ""
 
-#: systemv/cupsaccept.c:157 systemv/lp.c:503
+#: systemv/cupsaccept.c:157 systemv/lp.c:497
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr ""
 
-#: systemv/lp.c:217
+#: systemv/lp.c:211
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
 msgstr ""
@@ -2035,27 +2035,27 @@
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:551
+#: scheduler/cupsfilter.c:579
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:768 test/ipptool.c:329
+#: test/ippfind.c:749 test/ipptool.c:346
 #, c-format
 msgid "%s: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ippfind.c:781 test/ipptool.c:343
+#: test/ippfind.c:762 test/ipptool.c:360
 #, c-format
 msgid "%s: Missing version for \"-V\"."
 msgstr ""
 
-#: systemv/lp.c:427
+#: systemv/lp.c:421
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:442
+#: scheduler/cupsfilter.c:451
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
@@ -2065,15 +2065,15 @@
 msgid "%s: Operation failed: %s"
 msgstr ""
 
-#: berkeley/lpq.c:94 berkeley/lpr.c:71 berkeley/lprm.c:67 systemv/cancel.c:82
-#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
-#: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:88 test/ipptool.c:301 test/ipptool.c:318
+#: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82
+#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96
+#: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73
+#: systemv/lpstat.c:88 test/ipptool.c:291 test/ipptool.c:335
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: berkeley/lpq.c:296 scheduler/cupsfilter.c:1247 systemv/cancel.c:245
+#: berkeley/lpq.c:284 scheduler/cupsfilter.c:1275 systemv/cancel.c:245
 #: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
@@ -2084,236 +2084,236 @@
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: scheduler/cupsfilter.c:407
+#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:96
+#: ppdc/ppdmerge.cxx:90
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:646 ppdc/ppdmerge.cxx:112
+#: scheduler/cupsfilter.c:674 ppdc/ppdmerge.cxx:106
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:374
+#: scheduler/cupsfilter.c:383
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:151 systemv/lpstat.c:575
+#: berkeley/lpq.c:140 systemv/lpstat.c:575
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:419
+#: scheduler/cupsfilter.c:428
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1453
+#: scheduler/cupsfilter.c:1479
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: test/ippfind.c:667
+#: test/ippfind.c:648
 #, c-format
 msgid "%s: Unknown option \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:948
+#: test/ippfind.c:928
 #, c-format
 msgid "%s: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:399
+#: scheduler/cupsfilter.c:408
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
 
-#: berkeley/lpr.c:140
+#: berkeley/lpr.c:136
 #, c-format
 msgid ""
 "%s: Warning - \"%c\" format modifier not supported - output may not be "
 "correct."
 msgstr ""
 
-#: systemv/lp.c:477
+#: systemv/lp.c:471
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr ""
 
-#: systemv/lp.c:496
+#: systemv/lp.c:490
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr ""
 
-#: systemv/lp.c:184
+#: systemv/lp.c:178
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr ""
 
-#: systemv/lp.c:387
+#: systemv/lp.c:381
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: ppdc/sample.c:310
+#: ppdc/sample.c:305
 msgid "-1"
 msgstr ""
 
-#: ppdc/sample.c:301
+#: ppdc/sample.c:296
 msgid "-10"
 msgstr ""
 
-#: ppdc/sample.c:393
+#: ppdc/sample.c:388
 msgid "-100"
 msgstr ""
 
-#: ppdc/sample.c:392
+#: ppdc/sample.c:387
 msgid "-105"
 msgstr ""
 
-#: ppdc/sample.c:300
+#: ppdc/sample.c:295
 msgid "-11"
 msgstr ""
 
-#: ppdc/sample.c:391
+#: ppdc/sample.c:386
 msgid "-110"
 msgstr ""
 
-#: ppdc/sample.c:390
+#: ppdc/sample.c:385
 msgid "-115"
 msgstr ""
 
-#: ppdc/sample.c:299
+#: ppdc/sample.c:294
 msgid "-12"
 msgstr ""
 
-#: ppdc/sample.c:389
+#: ppdc/sample.c:384
 msgid "-120"
 msgstr ""
 
-#: ppdc/sample.c:298
+#: ppdc/sample.c:293
 msgid "-13"
 msgstr ""
 
-#: ppdc/sample.c:297
+#: ppdc/sample.c:292
 msgid "-14"
 msgstr ""
 
-#: ppdc/sample.c:296
+#: ppdc/sample.c:291
 msgid "-15"
 msgstr ""
 
-#: ppdc/sample.c:309
+#: ppdc/sample.c:304
 msgid "-2"
 msgstr ""
 
-#: ppdc/sample.c:409
+#: ppdc/sample.c:404
 msgid "-20"
 msgstr ""
 
-#: ppdc/sample.c:408
+#: ppdc/sample.c:403
 msgid "-25"
 msgstr ""
 
-#: ppdc/sample.c:308
+#: ppdc/sample.c:303
 msgid "-3"
 msgstr ""
 
-#: ppdc/sample.c:407
+#: ppdc/sample.c:402
 msgid "-30"
 msgstr ""
 
-#: ppdc/sample.c:406
+#: ppdc/sample.c:401
 msgid "-35"
 msgstr ""
 
-#: ppdc/sample.c:307
+#: ppdc/sample.c:302
 msgid "-4"
 msgstr ""
 
-#: ppdc/sample.c:405
+#: ppdc/sample.c:400
 msgid "-40"
 msgstr ""
 
-#: ppdc/sample.c:404
+#: ppdc/sample.c:399
 msgid "-45"
 msgstr ""
 
-#: ppdc/sample.c:306
+#: ppdc/sample.c:301
 msgid "-5"
 msgstr ""
 
-#: ppdc/sample.c:403
+#: ppdc/sample.c:398
 msgid "-50"
 msgstr ""
 
-#: ppdc/sample.c:402
+#: ppdc/sample.c:397
 msgid "-55"
 msgstr ""
 
-#: ppdc/sample.c:305
+#: ppdc/sample.c:300
 msgid "-6"
 msgstr ""
 
-#: ppdc/sample.c:401
+#: ppdc/sample.c:396
 msgid "-60"
 msgstr ""
 
-#: ppdc/sample.c:400
+#: ppdc/sample.c:395
 msgid "-65"
 msgstr ""
 
-#: ppdc/sample.c:304
+#: ppdc/sample.c:299
 msgid "-7"
 msgstr ""
 
-#: ppdc/sample.c:399
+#: ppdc/sample.c:394
 msgid "-70"
 msgstr ""
 
-#: ppdc/sample.c:398
+#: ppdc/sample.c:393
 msgid "-75"
 msgstr ""
 
-#: ppdc/sample.c:303
+#: ppdc/sample.c:298
 msgid "-8"
 msgstr ""
 
-#: ppdc/sample.c:397
+#: ppdc/sample.c:392
 msgid "-80"
 msgstr ""
 
-#: ppdc/sample.c:396
+#: ppdc/sample.c:391
 msgid "-85"
 msgstr ""
 
-#: ppdc/sample.c:302
+#: ppdc/sample.c:297
 msgid "-9"
 msgstr ""
 
-#: ppdc/sample.c:395
+#: ppdc/sample.c:390
 msgid "-90"
 msgstr ""
 
-#: ppdc/sample.c:394
+#: ppdc/sample.c:389
 msgid "-95"
 msgstr ""
 
-#: ppdc/sample.c:311
+#: ppdc/sample.c:306
 msgid "0"
 msgstr ""
 
-#: ppdc/sample.c:312
+#: ppdc/sample.c:307
 msgid "1"
 msgstr ""
 
-#: ppdc/sample.c:384
+#: ppdc/sample.c:379
 msgid "1 inch/sec."
 msgstr ""
 
@@ -2325,7 +2325,7 @@
 msgid "1.25x2.25\""
 msgstr ""
 
-#: ppdc/sample.c:432
+#: ppdc/sample.c:427
 msgid "1.5 inch/sec."
 msgstr ""
 
@@ -2345,11 +2345,11 @@
 msgid "1.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:321
+#: ppdc/sample.c:316
 msgid "10"
 msgstr ""
 
-#: ppdc/sample.c:443
+#: ppdc/sample.c:438
 msgid "10 inches/sec."
 msgstr ""
 
@@ -2365,39 +2365,39 @@
 msgid "10 x 14"
 msgstr ""
 
-#: ppdc/sample.c:423
+#: ppdc/sample.c:418
 msgid "100"
 msgstr ""
 
-#: ppdc/sample.c:334
+#: ppdc/sample.c:329
 msgid "100 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:424
+#: ppdc/sample.c:419
 msgid "105"
 msgstr ""
 
-#: ppdc/sample.c:322
+#: ppdc/sample.c:317
 msgid "11"
 msgstr ""
 
-#: ppdc/sample.c:444
+#: ppdc/sample.c:439
 msgid "11 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:425
+#: ppdc/sample.c:420
 msgid "110"
 msgstr ""
 
-#: ppdc/sample.c:426
+#: ppdc/sample.c:421
 msgid "115"
 msgstr ""
 
-#: ppdc/sample.c:323
+#: ppdc/sample.c:318
 msgid "12"
 msgstr ""
 
-#: ppdc/sample.c:445
+#: ppdc/sample.c:440
 msgid "12 inches/sec."
 msgstr ""
 
@@ -2405,11 +2405,11 @@
 msgid "12 x 11"
 msgstr ""
 
-#: ppdc/sample.c:427
+#: ppdc/sample.c:422
 msgid "120"
 msgstr ""
 
-#: ppdc/sample.c:335
+#: ppdc/sample.c:330
 msgid "120 mm/sec."
 msgstr ""
 
@@ -2421,7 +2421,7 @@
 msgid "120x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:324
+#: ppdc/sample.c:319
 msgid "13"
 msgstr ""
 
@@ -2429,15 +2429,15 @@
 msgid "136dpi"
 msgstr ""
 
-#: ppdc/sample.c:325
+#: ppdc/sample.c:320
 msgid "14"
 msgstr ""
 
-#: ppdc/sample.c:326
+#: ppdc/sample.c:321
 msgid "15"
 msgstr ""
 
-#: ppdc/sample.c:328
+#: ppdc/sample.c:323
 msgid "15 mm/sec."
 msgstr ""
 
@@ -2445,23 +2445,23 @@
 msgid "15 x 11"
 msgstr ""
 
-#: ppdc/sample.c:336
+#: ppdc/sample.c:331
 msgid "150 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:283
+#: ppdc/sample.c:278
 msgid "150dpi"
 msgstr ""
 
-#: ppdc/sample.c:368
+#: ppdc/sample.c:363
 msgid "16"
 msgstr ""
 
-#: ppdc/sample.c:369
+#: ppdc/sample.c:364
 msgid "17"
 msgstr ""
 
-#: ppdc/sample.c:370
+#: ppdc/sample.c:365
 msgid "18"
 msgstr ""
 
@@ -2469,19 +2469,19 @@
 msgid "180dpi"
 msgstr ""
 
-#: ppdc/sample.c:371
+#: ppdc/sample.c:366
 msgid "19"
 msgstr ""
 
-#: ppdc/sample.c:313
+#: ppdc/sample.c:308
 msgid "2"
 msgstr ""
 
-#: ppdc/sample.c:385
+#: ppdc/sample.c:380
 msgid "2 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:270
+#: ppdc/sample.c:262
 msgid "2-Sided Printing"
 msgstr ""
 
@@ -2537,7 +2537,7 @@
 msgid "2.38x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:433
+#: ppdc/sample.c:428
 msgid "2.5 inches/sec."
 msgstr ""
 
@@ -2557,15 +2557,15 @@
 msgid "2.9 x 1\""
 msgstr ""
 
-#: ppdc/sample.c:372
+#: ppdc/sample.c:367
 msgid "20"
 msgstr ""
 
-#: ppdc/sample.c:329
+#: ppdc/sample.c:324
 msgid "20 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:337
+#: ppdc/sample.c:332
 msgid "200 mm/sec."
 msgstr ""
 
@@ -2573,19 +2573,19 @@
 msgid "203dpi"
 msgstr ""
 
-#: ppdc/sample.c:373
+#: ppdc/sample.c:368
 msgid "21"
 msgstr ""
 
-#: ppdc/sample.c:374
+#: ppdc/sample.c:369
 msgid "22"
 msgstr ""
 
-#: ppdc/sample.c:375
+#: ppdc/sample.c:370
 msgid "23"
 msgstr ""
 
-#: ppdc/sample.c:376
+#: ppdc/sample.c:371
 msgid "24"
 msgstr ""
 
@@ -2597,35 +2597,35 @@
 msgid "240x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:377
+#: ppdc/sample.c:372
 msgid "25"
 msgstr ""
 
-#: ppdc/sample.c:338
+#: ppdc/sample.c:333
 msgid "250 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:378
+#: ppdc/sample.c:373
 msgid "26"
 msgstr ""
 
-#: ppdc/sample.c:379
+#: ppdc/sample.c:374
 msgid "27"
 msgstr ""
 
-#: ppdc/sample.c:380
+#: ppdc/sample.c:375
 msgid "28"
 msgstr ""
 
-#: ppdc/sample.c:381
+#: ppdc/sample.c:376
 msgid "29"
 msgstr ""
 
-#: ppdc/sample.c:314
+#: ppdc/sample.c:309
 msgid "3"
 msgstr ""
 
-#: ppdc/sample.c:386
+#: ppdc/sample.c:381
 msgid "3 inches/sec."
 msgstr ""
 
@@ -2685,15 +2685,15 @@
 msgid "3.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:382
+#: ppdc/sample.c:377
 msgid "30"
 msgstr ""
 
-#: ppdc/sample.c:330
+#: ppdc/sample.c:325
 msgid "30 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:339
+#: ppdc/sample.c:334
 msgid "300 mm/sec."
 msgstr ""
 
@@ -2701,7 +2701,7 @@
 msgid "300dpi"
 msgstr ""
 
-#: ppdc/sample.c:410
+#: ppdc/sample.c:405
 msgid "35"
 msgstr ""
 
@@ -2713,11 +2713,11 @@
 msgid "360x180dpi"
 msgstr ""
 
-#: ppdc/sample.c:315
+#: ppdc/sample.c:310
 msgid "4"
 msgstr ""
 
-#: ppdc/sample.c:387
+#: ppdc/sample.c:382
 msgid "4 inches/sec."
 msgstr ""
 
@@ -2757,23 +2757,23 @@
 msgid "4.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:411
+#: ppdc/sample.c:406
 msgid "40"
 msgstr ""
 
-#: ppdc/sample.c:331
+#: ppdc/sample.c:326
 msgid "40 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:412
+#: ppdc/sample.c:407
 msgid "45"
 msgstr ""
 
-#: ppdc/sample.c:316
+#: ppdc/sample.c:311
 msgid "5"
 msgstr ""
 
-#: ppdc/sample.c:437
+#: ppdc/sample.c:432
 msgid "5 inches/sec."
 msgstr ""
 
@@ -2781,19 +2781,19 @@
 msgid "5 x 7"
 msgstr ""
 
-#: ppdc/sample.c:413
+#: ppdc/sample.c:408
 msgid "50"
 msgstr ""
 
-#: ppdc/sample.c:414
+#: ppdc/sample.c:409
 msgid "55"
 msgstr ""
 
-#: ppdc/sample.c:317
+#: ppdc/sample.c:312
 msgid "6"
 msgstr ""
 
-#: ppdc/sample.c:438
+#: ppdc/sample.c:433
 msgid "6 inches/sec."
 msgstr ""
 
@@ -2825,15 +2825,15 @@
 msgid "6.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:415
+#: ppdc/sample.c:410
 msgid "60"
 msgstr ""
 
-#: ppdc/sample.c:332
+#: ppdc/sample.c:327
 msgid "60 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:261
+#: ppdc/sample.c:253
 msgid "600dpi"
 msgstr ""
 
@@ -2845,15 +2845,15 @@
 msgid "60x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:416
+#: ppdc/sample.c:411
 msgid "65"
 msgstr ""
 
-#: ppdc/sample.c:318
+#: ppdc/sample.c:313
 msgid "7"
 msgstr ""
 
-#: ppdc/sample.c:440
+#: ppdc/sample.c:435
 msgid "7 inches/sec."
 msgstr ""
 
@@ -2861,23 +2861,23 @@
 msgid "7 x 9"
 msgstr ""
 
-#: ppdc/sample.c:417
+#: ppdc/sample.c:412
 msgid "70"
 msgstr ""
 
-#: ppdc/sample.c:252
+#: ppdc/sample.c:261
 msgid "720dpi"
 msgstr ""
 
-#: ppdc/sample.c:418
+#: ppdc/sample.c:413
 msgid "75"
 msgstr ""
 
-#: ppdc/sample.c:319
+#: ppdc/sample.c:314
 msgid "8"
 msgstr ""
 
-#: ppdc/sample.c:441
+#: ppdc/sample.c:436
 msgid "8 inches/sec."
 msgstr ""
 
@@ -2913,23 +2913,23 @@
 msgid "8.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:419
+#: ppdc/sample.c:414
 msgid "80"
 msgstr ""
 
-#: ppdc/sample.c:333
+#: ppdc/sample.c:328
 msgid "80 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:420
+#: ppdc/sample.c:415
 msgid "85"
 msgstr ""
 
-#: ppdc/sample.c:320
+#: ppdc/sample.c:315
 msgid "9"
 msgstr ""
 
-#: ppdc/sample.c:442
+#: ppdc/sample.c:437
 msgid "9 inches/sec."
 msgstr ""
 
@@ -2945,32 +2945,32 @@
 msgid "9-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:421
+#: ppdc/sample.c:416
 msgid "90"
 msgstr ""
 
-#: ppdc/sample.c:422
+#: ppdc/sample.c:417
 msgid "95"
 msgstr ""
 
-#: berkeley/lpc.c:213
+#: berkeley/lpc.c:205
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2368
+#: cgi-bin/admin.c:2348
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2364
+#: cgi-bin/admin.c:2344
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
-#: scheduler/ipp.c:2293
+#: scheduler/ipp.c:2274
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
 
-#: scheduler/ipp.c:936
+#: scheduler/ipp.c:916
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr ""
@@ -3111,24 +3111,24 @@
 msgid "ARCH E Long Edge"
 msgstr ""
 
-#: cgi-bin/classes.c:169 cgi-bin/printers.c:172
+#: cgi-bin/classes.c:161 cgi-bin/printers.c:164
 msgid "Accept Jobs"
 msgstr ""
 
-#: cups/http-support.c:1359
+#: cups/http-support.c:1347
 msgid "Accepted"
 msgstr ""
 
-#: cgi-bin/admin.c:570
+#: cgi-bin/admin.c:548
 msgid "Add Class"
 msgstr ""
 
-#: cgi-bin/admin.c:882
+#: cgi-bin/admin.c:860
 msgid "Add Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525
-#: cgi-bin/admin.c:535
+#: cgi-bin/admin.c:422 cgi-bin/admin.c:455 cgi-bin/admin.c:503
+#: cgi-bin/admin.c:513
 msgid "Add RSS Subscription"
 msgstr ""
 
@@ -3136,28 +3136,28 @@
 msgid "Address"
 msgstr ""
 
-#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745
+#: cgi-bin/admin.c:188 cgi-bin/admin.c:262 cgi-bin/admin.c:2725
 msgid "Administration"
 msgstr ""
 
-#: ppdc/sample.c:429
+#: ppdc/sample.c:424
 msgid "Always"
 msgstr ""
 
-#: backend/socket.c:126
+#: backend/socket.c:121
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
-#: ppdc/sample.c:450
+#: ppdc/sample.c:445
 msgid "Applicator"
 msgstr ""
 
-#: scheduler/ipp.c:1011
+#: scheduler/ipp.c:991
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 
-#: scheduler/ipp.c:242
+#: scheduler/ipp.c:239
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
@@ -3210,145 +3210,145 @@
 msgid "B9"
 msgstr ""
 
-#: scheduler/ipp.c:10793
+#: scheduler/ipp.c:10877
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
 
-#: cups/dest.c:1712
+#: cups/dest.c:1736
 msgid "Bad NULL dests pointer"
 msgstr ""
 
-#: cups/ppd.c:345
+#: cups/ppd.c:303
 msgid "Bad OpenGroup"
 msgstr ""
 
-#: cups/ppd.c:347
+#: cups/ppd.c:305
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr ""
 
-#: cups/ppd.c:349
+#: cups/ppd.c:307
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:149 cups/ppd-cache.c:196 cups/ppd-cache.c:234
-#: cups/ppd-cache.c:240 cups/ppd-cache.c:256 cups/ppd-cache.c:272
-#: cups/ppd-cache.c:281 cups/ppd-cache.c:289 cups/ppd-cache.c:306
-#: cups/ppd-cache.c:314 cups/ppd-cache.c:329 cups/ppd-cache.c:337
-#: cups/ppd-cache.c:358 cups/ppd-cache.c:370 cups/ppd-cache.c:385
-#: cups/ppd-cache.c:397 cups/ppd-cache.c:419 cups/ppd-cache.c:427
-#: cups/ppd-cache.c:445 cups/ppd-cache.c:453 cups/ppd-cache.c:468
-#: cups/ppd-cache.c:476 cups/ppd-cache.c:494 cups/ppd-cache.c:502
-#: cups/ppd-cache.c:529 cups/ppd-cache.c:599 cups/ppd-cache.c:607
-#: cups/ppd-cache.c:615
+#: cups/ppd-cache.c:117 cups/ppd-cache.c:164 cups/ppd-cache.c:202
+#: cups/ppd-cache.c:208 cups/ppd-cache.c:224 cups/ppd-cache.c:240
+#: cups/ppd-cache.c:249 cups/ppd-cache.c:257 cups/ppd-cache.c:274
+#: cups/ppd-cache.c:282 cups/ppd-cache.c:297 cups/ppd-cache.c:305
+#: cups/ppd-cache.c:326 cups/ppd-cache.c:338 cups/ppd-cache.c:353
+#: cups/ppd-cache.c:365 cups/ppd-cache.c:387 cups/ppd-cache.c:395
+#: cups/ppd-cache.c:413 cups/ppd-cache.c:421 cups/ppd-cache.c:436
+#: cups/ppd-cache.c:444 cups/ppd-cache.c:462 cups/ppd-cache.c:470
+#: cups/ppd-cache.c:497 cups/ppd-cache.c:567 cups/ppd-cache.c:575
+#: cups/ppd-cache.c:583
 msgid "Bad PPD cache file."
 msgstr ""
 
-#: cups/http-support.c:1374
+#: cups/http-support.c:1362
 msgid "Bad Request"
 msgstr ""
 
-#: cups/snmp.c:998
+#: cups/snmp.c:954
 msgid "Bad SNMP version number"
 msgstr ""
 
-#: cups/ppd.c:350
+#: cups/ppd.c:308
 msgid "Bad UIConstraints"
 msgstr ""
 
-#: scheduler/ipp.c:1372
+#: scheduler/ipp.c:1352
 #, c-format
 msgid "Bad copies value %d."
 msgstr ""
 
-#: cups/ppd.c:358
+#: cups/ppd.c:316
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1526 scheduler/ipp.c:2379
+#: cups/http-support.c:1598 scheduler/ipp.c:2360
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2418
+#: scheduler/ipp.c:2399
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8039 scheduler/ipp.c:8055 scheduler/ipp.c:9276
+#: scheduler/ipp.c:8125 scheduler/ipp.c:8141 scheduler/ipp.c:9360
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9292
+#: scheduler/ipp.c:9376
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
 
-#: cups/util.c:932
+#: cups/util.c:823
 msgid "Bad filename buffer"
 msgstr ""
 
-#: scheduler/ipp.c:1548
+#: scheduler/ipp.c:1527
 #, c-format
 msgid "Bad job-name value: %s"
 msgstr ""
 
-#: scheduler/ipp.c:1541
+#: scheduler/ipp.c:1520
 msgid "Bad job-name value: Wrong type or count."
 msgstr ""
 
-#: scheduler/ipp.c:9882
+#: scheduler/ipp.c:9967
 msgid "Bad job-priority value."
 msgstr ""
 
-#: scheduler/ipp.c:1402
+#: scheduler/ipp.c:1382
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1386
+#: scheduler/ipp.c:1366
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:9912
+#: scheduler/ipp.c:9997
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:3001 scheduler/ipp.c:3461 scheduler/ipp.c:5904
-#: scheduler/ipp.c:6051 scheduler/ipp.c:7473 scheduler/ipp.c:7742
-#: scheduler/ipp.c:8591 scheduler/ipp.c:8817 scheduler/ipp.c:9172
-#: scheduler/ipp.c:9775
+#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5930
+#: scheduler/ipp.c:6077 scheduler/ipp.c:7559 scheduler/ipp.c:7828
+#: scheduler/ipp.c:8678 scheduler/ipp.c:8904 scheduler/ipp.c:9256
+#: scheduler/ipp.c:9860
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2059 scheduler/ipp.c:5442
+#: scheduler/ipp.c:2040 scheduler/ipp.c:5468
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2023 scheduler/ipp.c:5406
+#: scheduler/ipp.c:2004 scheduler/ipp.c:5432
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1418
+#: scheduler/ipp.c:1398
 #, c-format
 msgid "Bad number-up value %d."
 msgstr ""
 
-#: cups/adminutil.c:292
+#: cups/adminutil.c:281
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr ""
 
-#: scheduler/ipp.c:1435
+#: scheduler/ipp.c:1415
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr ""
 
-#: scheduler/ipp.c:2461
+#: scheduler/ipp.c:2442
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
@@ -3357,156 +3357,156 @@
 msgid "Bad printer URI."
 msgstr ""
 
-#: scheduler/ipp.c:2522
+#: scheduler/ipp.c:2503
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: scheduler/ipp.c:210
+#: scheduler/ipp.c:207
 #, c-format
 msgid "Bad request ID %d."
 msgstr ""
 
-#: scheduler/ipp.c:195
+#: scheduler/ipp.c:192
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr ""
 
-#: cgi-bin/admin.c:1484
+#: cgi-bin/admin.c:1464
 msgid "Bad subscription ID"
 msgstr ""
 
-#: cups/ppd.c:360
+#: cups/ppd.c:318
 msgid "Bad value string"
 msgstr ""
 
-#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536
+#: cgi-bin/admin.c:3270 cgi-bin/admin.c:3516
 msgid "Banners"
 msgstr ""
 
-#: ppdc/sample.c:287
+#: ppdc/sample.c:282
 msgid "Bond Paper"
 msgstr ""
 
-#: backend/usb-darwin.c:1873
+#: backend/usb-darwin.c:1874
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2058
+#: filter/pstops.c:2029
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: ppdc/sample.c:254
+#: ppdc/sample.c:277
 msgid "CMYK"
 msgstr ""
 
-#: ppdc/sample.c:363
+#: ppdc/sample.c:358
 msgid "CPCL Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1485 cgi-bin/admin.c:1524 cgi-bin/admin.c:1534
+#: cgi-bin/admin.c:1465 cgi-bin/admin.c:1504 cgi-bin/admin.c:1514
 msgid "Cancel RSS Subscription"
 msgstr ""
 
-#: backend/ipp.c:2139
+#: backend/ipp.c:2198
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:2502
+#: scheduler/ipp.c:2483
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: ppdc/sample.c:279
+#: ppdc/sample.c:271
 msgid "Cassette"
 msgstr ""
 
-#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810
-#: cgi-bin/admin.c:1821
+#: cgi-bin/admin.c:1635 cgi-bin/admin.c:1777 cgi-bin/admin.c:1790
+#: cgi-bin/admin.c:1801
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2071 scheduler/ipp.c:5454
+#: scheduler/ipp.c:2052 scheduler/ipp.c:5480
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
 
-#: cgi-bin/classes.c:195 cgi-bin/classes.c:322
+#: cgi-bin/classes.c:187 cgi-bin/classes.c:314
 msgid "Classes"
 msgstr ""
 
-#: cgi-bin/printers.c:182
+#: cgi-bin/printers.c:174
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:3913
+#: scheduler/ipp.c:3893
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: ppdc/sample.c:282
+#: ppdc/sample.c:276
 msgid "Color"
 msgstr ""
 
-#: ppdc/sample.c:253
+#: ppdc/sample.c:274
 msgid "Color Mode"
 msgstr ""
 
-#: berkeley/lpc.c:204
+#: berkeley/lpc.c:196
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
 "exit    help    quit    status  ?"
 msgstr ""
 
-#: cups/snmp.c:1002
+#: cups/snmp.c:958
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:813 backend/lpd.c:888 backend/socket.c:405
+#: backend/ipp.c:854 backend/lpd.c:879 backend/socket.c:400
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:718 backend/lpd.c:711 backend/socket.c:324
+#: backend/ipp.c:759 backend/lpd.c:702 backend/socket.c:319
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1347
+#: cups/http-support.c:1335
 msgid "Continue"
 msgstr ""
 
-#: ppdc/sample.c:365
+#: ppdc/sample.c:360
 msgid "Continuous"
 msgstr ""
 
-#: backend/lpd.c:1037 backend/lpd.c:1169
+#: backend/lpd.c:1028 backend/lpd.c:1160
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1309 backend/lpd.c:481
+#: backend/ipp.c:1349 backend/lpd.c:472
 msgid "Copying print data."
 msgstr ""
 
-#: cups/http-support.c:1356
+#: cups/http-support.c:1344
 msgid "Created"
 msgstr ""
 
-#: cups/ppd.c:1113 cups/ppd.c:1153 cups/ppd.c:1398 cups/ppd.c:1501
+#: cups/ppd.c:1069 cups/ppd.c:1109 cups/ppd.c:1354 cups/ppd.c:1457
 msgid "Custom"
 msgstr ""
 
-#: ppdc/sample.c:359
+#: ppdc/sample.c:354
 msgid "CustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:357
+#: ppdc/sample.c:352
 msgid "CustominTearInterval"
 msgstr ""
 
-#: ppdc/sample.c:343
+#: ppdc/sample.c:338
 msgid "Cut"
 msgstr ""
 
-#: ppdc/sample.c:451
+#: ppdc/sample.c:446
 msgid "Cutter"
 msgstr ""
 
@@ -3518,23 +3518,23 @@
 msgid "Darkness"
 msgstr ""
 
-#: backend/lpd.c:1122
+#: backend/lpd.c:1113
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150
+#: cgi-bin/admin.c:2074 cgi-bin/admin.c:2085 cgi-bin/admin.c:2130
 msgid "Delete Class"
 msgstr ""
 
-#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235
+#: cgi-bin/admin.c:2159 cgi-bin/admin.c:2170 cgi-bin/admin.c:2215
 msgid "Delete Printer"
 msgstr ""
 
-#: ppdc/sample.c:281
+#: ppdc/sample.c:273
 msgid "DeskJet Series"
 msgstr ""
 
-#: scheduler/ipp.c:1296
+#: scheduler/ipp.c:1276
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr ""
@@ -3550,7 +3550,7 @@
 "        location = %s"
 msgstr ""
 
-#: ppdc/sample.c:436
+#: ppdc/sample.c:431
 msgid "Direct Thermal Media"
 msgstr ""
 
@@ -3579,16 +3579,16 @@
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:345
+#: ppdc/sample.c:340
 msgid "Disabled"
 msgstr ""
 
-#: scheduler/ipp.c:5953
+#: scheduler/ipp.c:5979
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: ppdc/sample.c:275
+#: ppdc/sample.c:267
 msgid "Duplexer"
 msgstr ""
 
@@ -3596,26 +3596,26 @@
 msgid "Dymo"
 msgstr ""
 
-#: ppdc/sample.c:431
+#: ppdc/sample.c:426
 msgid "EPL1 Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:434
+#: ppdc/sample.c:429
 msgid "EPL2 Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1849 cgi-bin/admin.c:1861 cgi-bin/admin.c:1915
-#: cgi-bin/admin.c:1922 cgi-bin/admin.c:1957 cgi-bin/admin.c:1970
-#: cgi-bin/admin.c:1994 cgi-bin/admin.c:2067
+#: cgi-bin/admin.c:1829 cgi-bin/admin.c:1841 cgi-bin/admin.c:1895
+#: cgi-bin/admin.c:1902 cgi-bin/admin.c:1937 cgi-bin/admin.c:1950
+#: cgi-bin/admin.c:1974 cgi-bin/admin.c:2047
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/adminutil.c:337
+#: cups/adminutil.c:326
 msgid "Empty PPD file."
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3561
+#: cgi-bin/admin.c:3541
 msgid "Ending Banner"
 msgstr ""
 
@@ -3635,7 +3635,7 @@
 msgid "Enter password:"
 msgstr ""
 
-#: scheduler/client.c:2510
+#: scheduler/client.c:2209
 msgid ""
 "Enter your username and password or the root username and password to access "
 "this page. If you are using Kerberos authentication, make sure you have a "
@@ -3730,7 +3730,7 @@
 msgid "Envelope DL"
 msgstr ""
 
-#: ppdc/sample.c:269
+#: ppdc/sample.c:261
 msgid "Envelope Feed"
 msgstr ""
 
@@ -3854,7 +3854,7 @@
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: test/ippfind.c:2797
+#: test/ippfind.c:2809
 msgid "Environment Variables:"
 msgstr ""
 
@@ -3862,12 +3862,12 @@
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3604
+#: cgi-bin/admin.c:3584
 msgid "Error Policy"
 msgstr ""
 
-#: filter/rastertopwg.c:403 filter/rastertopwg.c:418 filter/rastertopwg.c:429
-#: filter/rastertopwg.c:440
+#: filter/rastertopwg.c:395 filter/rastertopwg.c:410 filter/rastertopwg.c:421
+#: filter/rastertopwg.c:432
 msgid "Error sending raster data."
 msgstr ""
 
@@ -3875,43 +3875,43 @@
 msgid "Error: need hostname after \"-h\" option."
 msgstr ""
 
-#: ppdc/sample.c:355
+#: ppdc/sample.c:350
 msgid "Every 10 Labels"
 msgstr ""
 
-#: ppdc/sample.c:347
+#: ppdc/sample.c:342
 msgid "Every 2 Labels"
 msgstr ""
 
-#: ppdc/sample.c:348
+#: ppdc/sample.c:343
 msgid "Every 3 Labels"
 msgstr ""
 
-#: ppdc/sample.c:349
+#: ppdc/sample.c:344
 msgid "Every 4 Labels"
 msgstr ""
 
-#: ppdc/sample.c:350
+#: ppdc/sample.c:345
 msgid "Every 5 Labels"
 msgstr ""
 
-#: ppdc/sample.c:351
+#: ppdc/sample.c:346
 msgid "Every 6 Labels"
 msgstr ""
 
-#: ppdc/sample.c:352
+#: ppdc/sample.c:347
 msgid "Every 7 Labels"
 msgstr ""
 
-#: ppdc/sample.c:353
+#: ppdc/sample.c:348
 msgid "Every 8 Labels"
 msgstr ""
 
-#: ppdc/sample.c:354
+#: ppdc/sample.c:349
 msgid "Every 9 Labels"
 msgstr ""
 
-#: ppdc/sample.c:346
+#: ppdc/sample.c:341
 msgid "Every Label"
 msgstr ""
 
@@ -3919,15 +3919,15 @@
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1402
+#: cups/http-support.c:1390
 msgid "Expectation Failed"
 msgstr ""
 
-#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375
+#: cgi-bin/admin.c:2336 cgi-bin/admin.c:2355
 msgid "Export Printers to Samba"
 msgstr ""
 
-#: test/ippfind.c:2743
+#: test/ippfind.c:2755
 msgid "Expressions:"
 msgstr ""
 
@@ -3982,15 +3982,15 @@
 msgid "File Folder "
 msgstr ""
 
-#: scheduler/ipp.c:2397
+#: scheduler/ipp.c:2378
 #, c-format
 msgid ""
 "File device URIs have been disabled. To enable, see the FileDevice directive "
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: filter/rastertoepson.c:1117 filter/rastertohp.c:845
-#: filter/rastertolabel.c:1267
+#: filter/rastertoepson.c:1102 filter/rastertohp.c:834
+#: filter/rastertolabel.c:1259
 #, c-format
 msgid "Finished page %d."
 msgstr ""
@@ -3999,38 +3999,38 @@
 msgid "Folio"
 msgstr ""
 
-#: cups/http-support.c:1381
+#: cups/http-support.c:1369
 msgid "Forbidden"
 msgstr ""
 
-#: cups/ppd.c:742 cups/ppd.c:1302
+#: cups/ppd.c:700 cups/ppd.c:1258
 msgid "General"
 msgstr ""
 
-#: ppdc/sample.c:259
+#: ppdc/sample.c:251
 msgid "Generic"
 msgstr ""
 
-#: cups/snmp.c:1012
+#: cups/snmp.c:968
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: ppdc/sample.c:290
+#: ppdc/sample.c:285
 msgid "Glossy Paper"
 msgstr ""
 
-#: scheduler/ipp.c:2979 scheduler/ipp.c:3387 scheduler/ipp.c:3925
-#: scheduler/ipp.c:5882 scheduler/ipp.c:6029 scheduler/ipp.c:7450
-#: scheduler/ipp.c:8569 scheduler/ipp.c:8795 scheduler/ipp.c:9150
-#: scheduler/ipp.c:9753
+#: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905
+#: scheduler/ipp.c:5908 scheduler/ipp.c:6055 scheduler/ipp.c:7536
+#: scheduler/ipp.c:8656 scheduler/ipp.c:8882 scheduler/ipp.c:9234
+#: scheduler/ipp.c:9838
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: ppdc/sample.c:255
+#: ppdc/sample.c:275
 msgid "Grayscale"
 msgstr ""
 
-#: ppdc/sample.c:280
+#: ppdc/sample.c:272
 msgid "HP"
 msgstr ""
 
@@ -4042,95 +4042,95 @@
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ipp.c:3209 cups/ipp.c:3236 cups/ipp.c:3259
+#: cups/ipp.c:3183 cups/ipp.c:3210 cups/ipp.c:3233
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:3172
+#: cups/ipp.c:3146
 msgid "IPP attribute has no name."
 msgstr ""
 
-#: cups/ipp.c:7026
+#: cups/ipp.c:7000
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3621
+#: cups/ipp.c:3594
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3402
+#: cups/ipp.c:3376
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:3463
+#: cups/ipp.c:3437
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3642
+#: cups/ipp.c:3615
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3377
+#: cups/ipp.c:3351
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3101
+#: cups/ipp.c:3075
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:3374
+#: cups/ipp.c:3348
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3574
+#: cups/ipp.c:3547
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3583
+#: cups/ipp.c:3556
 msgid "IPP language length too large."
 msgstr ""
 
-#: cups/ipp.c:3286
+#: cups/ipp.c:3260
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:3668
+#: cups/ipp.c:3641
 msgid "IPP memberName value is empty."
 msgstr ""
 
-#: cups/ipp.c:3660
+#: cups/ipp.c:3633
 msgid "IPP memberName with no attribute."
 msgstr ""
 
-#: cups/ipp.c:3155
+#: cups/ipp.c:3129
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:3540
+#: cups/ipp.c:3514
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3698
+#: cups/ipp.c:3671
 msgid "IPP octetString length too large."
 msgstr ""
 
-#: cups/ipp.c:3508
+#: cups/ipp.c:3482
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:3481
+#: cups/ipp.c:3455
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3601
+#: cups/ipp.c:3574
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3536
+#: cups/ipp.c:3510
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3360
+#: cups/ipp.c:3334
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -4138,47 +4138,47 @@
 msgid "ISOLatin1"
 msgstr ""
 
-#: cups/ppd.c:353
+#: cups/ppd.c:311
 msgid "Illegal control character"
 msgstr ""
 
-#: cups/ppd.c:354
+#: cups/ppd.c:312
 msgid "Illegal main keyword string"
 msgstr ""
 
-#: cups/ppd.c:355
+#: cups/ppd.c:313
 msgid "Illegal option keyword string"
 msgstr ""
 
-#: cups/ppd.c:356
+#: cups/ppd.c:314
 msgid "Illegal translation string"
 msgstr ""
 
-#: cups/ppd.c:357
+#: cups/ppd.c:315
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: ppdc/sample.c:274
+#: ppdc/sample.c:266
 msgid "Installable Options"
 msgstr ""
 
-#: ppdc/sample.c:277
+#: ppdc/sample.c:269
 msgid "Installed"
 msgstr ""
 
-#: ppdc/sample.c:293
+#: ppdc/sample.c:288
 msgid "IntelliBar Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:292
+#: ppdc/sample.c:287
 msgid "Intellitech"
 msgstr ""
 
-#: cups/http-support.c:1408
+#: cups/http-support.c:1396
 msgid "Internal Server Error"
 msgstr ""
 
-#: cups/ppd.c:344
+#: cups/ppd.c:302
 msgid "Internal error"
 msgstr ""
 
@@ -4190,24 +4190,24 @@
 msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: backend/ipp.c:317
+#: backend/ipp.c:319
 msgid "Internet Printing Protocol"
 msgstr ""
 
-#: cups/pwg-media.c:312 cups/pwg-media.c:331
+#: cups/pwg-media.c:293 cups/pwg-media.c:312
 msgid "Invalid media name arguments."
 msgstr ""
 
-#: cups/dest-options.c:1052
+#: cups/dest-options.c:1032
 msgid "Invalid media size."
 msgstr ""
 
-#: filter/commandtops.c:125
+#: filter/commandtops.c:114
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr ""
 
-#: cups/ppd.c:1420
+#: cups/ppd.c:1376
 msgid "JCL"
 msgstr ""
 
@@ -4267,93 +4267,93 @@
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:8867
+#: scheduler/ipp.c:8954
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:3019 scheduler/ipp.c:3253 scheduler/ipp.c:3312
-#: scheduler/ipp.c:3489 scheduler/ipp.c:3935 scheduler/ipp.c:5540
-#: scheduler/ipp.c:5922 scheduler/ipp.c:6069 scheduler/ipp.c:6358
-#: scheduler/ipp.c:7297 scheduler/ipp.c:7319 scheduler/ipp.c:7491
-#: scheduler/ipp.c:7716 scheduler/ipp.c:7759 scheduler/ipp.c:8609
-#: scheduler/ipp.c:8835 scheduler/ipp.c:9190 scheduler/ipp.c:9793
+#: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292
+#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5566
+#: scheduler/ipp.c:5948 scheduler/ipp.c:6095 scheduler/ipp.c:6433
+#: scheduler/ipp.c:7383 scheduler/ipp.c:7405 scheduler/ipp.c:7577
+#: scheduler/ipp.c:7802 scheduler/ipp.c:7845 scheduler/ipp.c:8696
+#: scheduler/ipp.c:8922 scheduler/ipp.c:9274 scheduler/ipp.c:9878
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:3521
+#: scheduler/ipp.c:3501
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3515
+#: scheduler/ipp.c:3495
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3527
+#: scheduler/ipp.c:3507
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:7517 scheduler/ipp.c:7801 scheduler/ipp.c:9808
+#: scheduler/ipp.c:7603 scheduler/ipp.c:7887 scheduler/ipp.c:9893
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:8849
+#: scheduler/ipp.c:8936
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:3034
+#: scheduler/ipp.c:3014
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:8623
+#: scheduler/ipp.c:8710
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1055
+#: cgi-bin/ipp-var.c:1035
 msgid "Job Completed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1053
+#: cgi-bin/ipp-var.c:1033
 msgid "Job Created"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1059
+#: cgi-bin/ipp-var.c:1039
 msgid "Job Options Changed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1057
+#: cgi-bin/ipp-var.c:1037
 msgid "Job Stopped"
 msgstr ""
 
-#: scheduler/ipp.c:9890
+#: scheduler/ipp.c:9975
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
-#: cgi-bin/jobs.c:198
+#: cgi-bin/jobs.c:192
 msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:9926 scheduler/ipp.c:9945 scheduler/ipp.c:9956
+#: scheduler/ipp.c:10011 scheduler/ipp.c:10028 scheduler/ipp.c:10039
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:8715
+#: scheduler/ipp.c:8802
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
-#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195
+#: cgi-bin/jobs.c:97 cgi-bin/jobs.c:108 cgi-bin/jobs.c:189
 msgid "Jobs"
 msgstr ""
 
-#: backend/lpd.c:186
+#: backend/lpd.c:177
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
@@ -4361,11 +4361,11 @@
 msgid "Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:446
+#: ppdc/sample.c:441
 msgid "Label Top"
 msgstr ""
 
-#: scheduler/ipp.c:2080 scheduler/ipp.c:5463
+#: scheduler/ipp.c:2061 scheduler/ipp.c:5489
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -4374,7 +4374,7 @@
 msgid "Large Address"
 msgstr ""
 
-#: ppdc/sample.c:291
+#: ppdc/sample.c:286
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
@@ -4390,39 +4390,39 @@
 msgid "Light"
 msgstr ""
 
-#: cups/ppd.c:352
+#: cups/ppd.c:310
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr ""
 
-#: cgi-bin/admin.c:2393
+#: cgi-bin/admin.c:2373
 msgid "List Available Printers"
 msgstr ""
 
-#: ppdc/sample.c:272
+#: ppdc/sample.c:264
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1640
+#: cups/http-support.c:1725
 msgid "Looking for printer."
 msgstr ""
 
-#: ppdc/sample.c:268
+#: ppdc/sample.c:260
 msgid "Manual Feed"
 msgstr ""
 
-#: cups/ppd.c:789 cups/ppd.c:1357
+#: cups/ppd.c:747 cups/ppd.c:1313
 msgid "Media Size"
 msgstr ""
 
-#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262
+#: cups/ppd.c:751 cups/ppd.c:1317 ppdc/sample.c:254
 msgid "Media Source"
 msgstr ""
 
-#: ppdc/sample.c:364
+#: ppdc/sample.c:359
 msgid "Media Tracking"
 msgstr ""
 
-#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285
+#: cups/ppd.c:749 cups/ppd.c:1315 ppdc/sample.c:280
 msgid "Media Type"
 msgstr ""
 
@@ -4430,79 +4430,79 @@
 msgid "Medium"
 msgstr ""
 
-#: cups/ppd.c:341
+#: cups/ppd.c:299
 msgid "Memory allocation error"
 msgstr ""
 
-#: cups/ppd.c:361
+#: cups/ppd.c:319
 msgid "Missing CloseGroup"
 msgstr ""
 
-#: cups/ppd.c:342
+#: cups/ppd.c:300
 msgid "Missing PPD-Adobe-4.x header"
 msgstr ""
 
-#: cups/ppd.c:351
+#: cups/ppd.c:309
 msgid "Missing asterisk in column 1"
 msgstr ""
 
-#: scheduler/ipp.c:5945
+#: scheduler/ipp.c:5971
 msgid "Missing document-number attribute."
 msgstr ""
 
-#: cups/adminutil.c:273
+#: cups/adminutil.c:262
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr ""
 
-#: cgi-bin/admin.c:736 cgi-bin/admin.c:2106 cgi-bin/admin.c:2191
-#: cgi-bin/admin.c:2785 cgi-bin/admin.c:3039 cgi-bin/admin.c:3150
-#: cgi-bin/admin.c:3860
+#: cgi-bin/admin.c:714 cgi-bin/admin.c:2086 cgi-bin/admin.c:2171
+#: cgi-bin/admin.c:2765 cgi-bin/admin.c:3019 cgi-bin/admin.c:3130
+#: cgi-bin/admin.c:3840
 msgid "Missing form variable"
 msgstr ""
 
-#: scheduler/ipp.c:9244
+#: scheduler/ipp.c:9328
 msgid "Missing last-document attribute in request."
 msgstr ""
 
-#: cups/pwg-media.c:574
+#: cups/pwg-media.c:555
 msgid "Missing media or media-col."
 msgstr ""
 
-#: cups/pwg-media.c:493
+#: cups/pwg-media.c:474
 msgid "Missing media-size in media-col."
 msgstr ""
 
-#: scheduler/ipp.c:6488
+#: scheduler/ipp.c:6574
 msgid "Missing notify-subscription-ids attribute."
 msgstr ""
 
-#: cups/ppd.c:359
+#: cups/ppd.c:317
 msgid "Missing option keyword"
 msgstr ""
 
-#: scheduler/ipp.c:3160 scheduler/ipp.c:3185
+#: scheduler/ipp.c:3140 scheduler/ipp.c:3165
 msgid "Missing requesting-user-name attribute."
 msgstr ""
 
-#: scheduler/ipp.c:391
+#: scheduler/ipp.c:388
 msgid "Missing required attributes."
 msgstr ""
 
-#: cups/adminutil.c:254
+#: cups/adminutil.c:243
 #, c-format
 msgid "Missing value on line %d."
 msgstr ""
 
-#: cups/ppd.c:343
+#: cups/ppd.c:301
 msgid "Missing value string"
 msgstr ""
 
-#: cups/pwg-media.c:481
+#: cups/pwg-media.c:462
 msgid "Missing x-dimension in media-size."
 msgstr ""
 
-#: cups/pwg-media.c:487
+#: cups/pwg-media.c:468
 msgid "Missing y-dimension in media-size."
 msgstr ""
 
@@ -4515,100 +4515,100 @@
 "        device-id = %s"
 msgstr ""
 
-#: test/ippfind.c:2774
+#: test/ippfind.c:2786
 msgid "Modifiers:"
 msgstr ""
 
-#: cgi-bin/admin.c:570
+#: cgi-bin/admin.c:548
 msgid "Modify Class"
 msgstr ""
 
-#: cgi-bin/admin.c:882
+#: cgi-bin/admin.c:860
 msgid "Modify Printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516
+#: cgi-bin/ipp-var.c:410 cgi-bin/ipp-var.c:501
 msgid "Move All Jobs"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514
+#: cgi-bin/ipp-var.c:349 cgi-bin/ipp-var.c:408 cgi-bin/ipp-var.c:499
 msgid "Move Job"
 msgstr ""
 
-#: cups/http-support.c:1365
+#: cups/http-support.c:1353
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd.c:340
+#: cups/ppd.c:298
 msgid "NULL PPD file pointer"
 msgstr ""
 
-#: cups/snmp.c:1049
+#: cups/snmp.c:1005
 msgid "Name OID uses indefinite length"
 msgstr ""
 
-#: scheduler/ipp.c:1074
+#: scheduler/ipp.c:1054
 msgid "Nested classes are not allowed."
 msgstr ""
 
-#: ppdc/sample.c:430
+#: ppdc/sample.c:425
 msgid "Never"
 msgstr ""
 
-#: ppdc/sample.c:256
+#: ppdc/sample.c:265
 msgid "New Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:258
+#: ppdc/sample.c:267
 msgid "New Stylus Photo Series"
 msgstr ""
 
-#: cups/ppd.c:1949
+#: cups/ppd.c:1904
 msgid "No"
 msgstr ""
 
-#: cups/http-support.c:1362
+#: cups/http-support.c:1350
 msgid "No Content"
 msgstr ""
 
-#: cups/util.c:1307
+#: cups/util.c:1123
 msgid "No PPD name"
 msgstr ""
 
-#: cups/snmp.c:1043
+#: cups/snmp.c:999
 msgid "No VarBind SEQUENCE"
 msgstr ""
 
-#: cups/adminutil.c:788
+#: cups/adminutil.c:777
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:586 cups/request.c:949
+#: cups/request.c:570 cups/request.c:933
 msgid "No active connection"
 msgstr ""
 
-#: scheduler/ipp.c:3438
+#: scheduler/ipp.c:3418
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
 
-#: scheduler/ipp.c:219
+#: scheduler/ipp.c:216
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:3061
+#: scheduler/ipp.c:3041
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/snmp.c:1000
+#: cups/snmp.c:956
 msgid "No community name"
 msgstr ""
 
-#: scheduler/ipp.c:5745
+#: scheduler/ipp.c:5771
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7063
+#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7149
 msgid "No destinations added."
 msgstr ""
 
@@ -4616,72 +4616,72 @@
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
 msgstr ""
 
-#: cups/snmp.c:1030
+#: cups/snmp.c:986
 msgid "No error-index"
 msgstr ""
 
-#: cups/snmp.c:1022
+#: cups/snmp.c:978
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:8005 scheduler/ipp.c:9258
+#: scheduler/ipp.c:8091 scheduler/ipp.c:9342
 msgid "No file in print request."
 msgstr ""
 
-#: cups/util.c:926
+#: cups/util.c:817
 msgid "No modification time"
 msgstr ""
 
-#: cups/snmp.c:1047
+#: cups/snmp.c:1003
 msgid "No name OID"
 msgstr ""
 
-#: filter/rastertoepson.c:1147 filter/rastertohp.c:876
-#: filter/rastertolabel.c:1296
+#: filter/rastertoepson.c:1132 filter/rastertohp.c:865
+#: filter/rastertolabel.c:1288
 msgid "No pages were found."
 msgstr ""
 
-#: cups/util.c:920
+#: cups/util.c:811
 msgid "No printer name"
 msgstr ""
 
-#: cups/util.c:1843
+#: cups/util.c:1647
 msgid "No printer-uri found"
 msgstr ""
 
-#: cups/util.c:1828
+#: cups/util.c:1631
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:6148
+#: scheduler/ipp.c:6179
 msgid "No printer-uri in request."
 msgstr ""
 
-#: cups/snmp.c:1014
+#: cups/snmp.c:970
 msgid "No request-id"
 msgstr ""
 
-#: scheduler/ipp.c:5348
+#: scheduler/ipp.c:5374
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:7390
+#: scheduler/ipp.c:7476
 msgid "No subscriptions found."
 msgstr ""
 
-#: cups/snmp.c:1038
+#: cups/snmp.c:994
 msgid "No variable-bindings SEQUENCE"
 msgstr ""
 
-#: cups/snmp.c:993
+#: cups/snmp.c:949
 msgid "No version number"
 msgstr ""
 
-#: ppdc/sample.c:367
+#: ppdc/sample.c:362
 msgid "Non-continuous (Mark sensing)"
 msgstr ""
 
-#: ppdc/sample.c:366
+#: ppdc/sample.c:361
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
@@ -4689,27 +4689,27 @@
 msgid "Normal"
 msgstr ""
 
-#: cups/http-support.c:1384
+#: cups/http-support.c:1372
 msgid "Not Found"
 msgstr ""
 
-#: cups/http-support.c:1396
+#: cups/http-support.c:1384
 msgid "Not Implemented"
 msgstr ""
 
-#: ppdc/sample.c:276
+#: ppdc/sample.c:268
 msgid "Not Installed"
 msgstr ""
 
-#: cups/http-support.c:1371
+#: cups/http-support.c:1359
 msgid "Not Modified"
 msgstr ""
 
-#: cups/http-support.c:1399
+#: cups/http-support.c:1387
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1510 scheduler/ipp.c:10489
+#: scheduler/ipp.c:1490 scheduler/ipp.c:10572
 msgid "Not allowed to print."
 msgstr ""
 
@@ -4723,15 +4723,15 @@
 "itself."
 msgstr ""
 
-#: cups/http-support.c:1353 cups/ppd.c:338
+#: cups/http-support.c:1341 cups/http-support.c:1477 cups/ppd.c:296
 msgid "OK"
 msgstr ""
 
-#: ppdc/sample.c:271
+#: ppdc/sample.c:263
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: ppdc/sample.c:361
+#: ppdc/sample.c:356
 msgid "Oki"
 msgstr ""
 
@@ -4739,68 +4739,68 @@
 msgid "Online Help"
 msgstr ""
 
-#: cups/adminutil.c:955
+#: cups/adminutil.c:944
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr ""
 
-#: cups/ppd.c:346
+#: cups/ppd.c:304
 msgid "OpenGroup without a CloseGroup first"
 msgstr ""
 
-#: cups/ppd.c:348
+#: cups/ppd.c:306
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3631
+#: cgi-bin/admin.c:3611
 msgid "Operation Policy"
 msgstr ""
 
-#: filter/pstops.c:2206
+#: filter/pstops.c:2177
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
 
-#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365
+#: cgi-bin/admin.c:3261 cgi-bin/admin.c:3345
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1457 scheduler/main.c:2002 systemv/cupsaddsmb.c:284
+#: scheduler/cupsfilter.c:1482 scheduler/main.c:2146 systemv/cupsaddsmb.c:284
 #: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817
-#: test/ippfind.c:2733 test/ipptool.c:4708 ppdc/ppdc.cxx:437
-#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369
+#: test/ippfind.c:2745 test/ipptool.c:4805 ppdc/ppdc.cxx:432
+#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363
 #: ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:157
+#: cups/ppd-cache.c:125
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1444
+#: cups/ppd-cache.c:1410
 msgid "Out of memory."
 msgstr ""
 
-#: cups/ppd.c:795 cups/ppd.c:1363
+#: cups/ppd.c:753 cups/ppd.c:1319
 msgid "Output Mode"
 msgstr ""
 
-#: systemv/lpstat.c:1239 systemv/lpstat.c:1243
+#: systemv/lpstat.c:1191 systemv/lpstat.c:1195
 #, c-format
 msgid "Output for printer %s is sent to %s"
 msgstr ""
 
-#: systemv/lpstat.c:1233
+#: systemv/lpstat.c:1185
 #, c-format
 msgid "Output for printer %s is sent to remote printer %s on %s"
 msgstr ""
 
-#: systemv/lpstat.c:1257 systemv/lpstat.c:1261
+#: systemv/lpstat.c:1209 systemv/lpstat.c:1213
 #, c-format
 msgid "Output for printer %s/%s is sent to %s"
 msgstr ""
 
-#: systemv/lpstat.c:1251
+#: systemv/lpstat.c:1203
 #, c-format
 msgid "Output for printer %s/%s is sent to remote printer %s on %s"
 msgstr ""
@@ -4809,7 +4809,7 @@
 msgid "PASS"
 msgstr ""
 
-#: ppdc/sample.c:260
+#: ppdc/sample.c:252
 msgid "PCL Laser Printer"
 msgstr ""
 
@@ -4837,23 +4837,23 @@
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
-#: cups/snmp.c:1010
+#: cups/snmp.c:966
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr ""
 
-#: cups/snmp.c:989
+#: cups/snmp.c:945
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: ppdc/sample.c:360
+#: ppdc/sample.c:355
 msgid "ParamCustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:358
+#: ppdc/sample.c:353
 msgid "ParamCustominTearInterval"
 msgstr ""
 
-#: cups/auth.c:206 cups/auth.c:374
+#: cups/auth.c:195 cups/auth.c:362
 #, c-format
 msgid "Password for %s on %s? "
 msgstr ""
@@ -4863,15 +4863,15 @@
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr ""
 
-#: cgi-bin/classes.c:167
+#: cgi-bin/classes.c:159
 msgid "Pause Class"
 msgstr ""
 
-#: cgi-bin/printers.c:170
+#: cgi-bin/printers.c:162
 msgid "Pause Printer"
 msgstr ""
 
-#: ppdc/sample.c:448
+#: ppdc/sample.c:443
 msgid "Peel-Off"
 msgstr ""
 
@@ -4883,19 +4883,19 @@
 msgid "Photo Labels"
 msgstr ""
 
-#: ppdc/sample.c:286
+#: ppdc/sample.c:281
 msgid "Plain Paper"
 msgstr ""
 
-#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580
+#: cgi-bin/admin.c:3279 cgi-bin/admin.c:3560
 msgid "Policies"
 msgstr ""
 
-#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662
+#: cgi-bin/admin.c:3286 cgi-bin/admin.c:3629 cgi-bin/admin.c:3642
 msgid "Port Monitor"
 msgstr ""
 
-#: ppdc/sample.c:278
+#: ppdc/sample.c:270
 msgid "PostScript Printer"
 msgstr ""
 
@@ -4915,11 +4915,11 @@
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: backend/ipp.c:921 backend/ipp.c:929
+#: backend/ipp.c:961 backend/ipp.c:969
 msgid "Preparing to print."
 msgstr ""
 
-#: ppdc/sample.c:295
+#: ppdc/sample.c:290
 msgid "Print Density"
 msgstr ""
 
@@ -4927,79 +4927,79 @@
 msgid "Print Job:"
 msgstr ""
 
-#: ppdc/sample.c:340
+#: ppdc/sample.c:335
 msgid "Print Mode"
 msgstr ""
 
-#: ppdc/sample.c:383
+#: ppdc/sample.c:378
 msgid "Print Rate"
 msgstr ""
 
-#: cgi-bin/printers.c:179
+#: cgi-bin/printers.c:171
 msgid "Print Self-Test Page"
 msgstr ""
 
-#: ppdc/sample.c:327
+#: ppdc/sample.c:322
 msgid "Print Speed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:792
+#: cgi-bin/ipp-var.c:777
 msgid "Print Test Page"
 msgstr ""
 
-#: ppdc/sample.c:356
+#: ppdc/sample.c:351
 msgid "Print and Cut"
 msgstr ""
 
-#: ppdc/sample.c:344
+#: ppdc/sample.c:339
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/socket.c:434 backend/usb-unix.c:191
+#: backend/socket.c:429 backend/usb-unix.c:184
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:2113
+#: backend/ipp.c:2172
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:2105
+#: backend/ipp.c:2164
 msgid "Print job too large."
 msgstr ""
 
-#: backend/ipp.c:1602
+#: backend/ipp.c:1642
 msgid "Print job was not accepted."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1047
+#: cgi-bin/ipp-var.c:1027
 msgid "Printer Added"
 msgstr ""
 
-#: ppdc/sample.c:263
+#: ppdc/sample.c:255
 msgid "Printer Default"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1051
+#: cgi-bin/ipp-var.c:1031
 msgid "Printer Deleted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1049
+#: cgi-bin/ipp-var.c:1029
 msgid "Printer Modified"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1045
+#: cgi-bin/ipp-var.c:1025
 msgid "Printer Paused"
 msgstr ""
 
-#: ppdc/sample.c:294
+#: ppdc/sample.c:289
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/ipp.c:2108
+#: backend/ipp.c:2167
 msgid "Printer cannot print supplied content."
 msgstr ""
 
-#: backend/ipp.c:2111
+#: backend/ipp.c:2170
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
@@ -5007,12 +5007,13 @@
 msgid "Printer:"
 msgstr ""
 
-#: cgi-bin/printers.c:204 cgi-bin/printers.c:332
+#: cgi-bin/printers.c:196 cgi-bin/printers.c:324
 msgid "Printers"
 msgstr ""
 
+#: driver/rastertoescpx.c:1882 driver/rastertopclx.c:1904
 #: filter/rastertoepson.c:1093 filter/rastertohp.c:817
-#: filter/rastertolabel.c:1243
+#: filter/rastertolabel.c:1249
 #, c-format
 msgid "Printing page %d, %d%% complete."
 msgstr ""
@@ -5025,51 +5026,51 @@
 msgid "Quarto"
 msgstr ""
 
-#: scheduler/ipp.c:1505 scheduler/ipp.c:10484
+#: scheduler/ipp.c:1485 scheduler/ipp.c:10567
 msgid "Quota limit reached."
 msgstr ""
 
-#: berkeley/lpq.c:520
+#: berkeley/lpq.c:490
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
 #. TRANSLATORS: Pri is job priority.
-#: berkeley/lpq.c:516
+#: berkeley/lpq.c:511
 msgid ""
 "Rank   Owner      Pri  Job        Files                       Total Size"
 msgstr ""
 
-#: cgi-bin/classes.c:171 cgi-bin/printers.c:174
+#: cgi-bin/classes.c:163 cgi-bin/printers.c:166
 msgid "Reject Jobs"
 msgstr ""
 
-#: backend/lpd.c:1033 backend/lpd.c:1165
+#: backend/lpd.c:1024 backend/lpd.c:1156
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr ""
 
-#: backend/lpd.c:1118
+#: backend/lpd.c:1109
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
 
-#: ppdc/sample.c:428
+#: ppdc/sample.c:423
 msgid "Reprint After Error"
 msgstr ""
 
-#: cups/http-support.c:1387
+#: cups/http-support.c:1375
 msgid "Request Entity Too Large"
 msgstr ""
 
-#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231
+#: cups/ppd.c:755 cups/ppd.c:1321 ppdc/sample.c:231
 msgid "Resolution"
 msgstr ""
 
-#: cgi-bin/classes.c:165
+#: cgi-bin/classes.c:157
 msgid "Resume Class"
 msgstr ""
 
-#: cgi-bin/printers.c:167
+#: cgi-bin/printers.c:159
 msgid "Resume Printer"
 msgstr ""
 
@@ -5077,69 +5078,69 @@
 msgid "Return Address"
 msgstr ""
 
-#: ppdc/sample.c:449
+#: ppdc/sample.c:444
 msgid "Rewind"
 msgstr ""
 
-#: cups/adminutil.c:2052
+#: cups/adminutil.c:2041
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr ""
 
-#: cups/snmp.c:991
+#: cups/snmp.c:947
 msgid "SEQUENCE uses indefinite length"
 msgstr ""
 
-#: cups/http-support.c:1411
+#: cups/http-support.c:1399
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/http-support.c:1368
+#: cups/http-support.c:1356
 msgid "See Other"
 msgstr ""
 
-#: backend/usb-darwin.c:552 backend/usb-libusb.c:366
+#: backend/usb-darwin.c:552 backend/usb-libusb.c:346
 msgid "Sending data to printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1061
+#: cgi-bin/ipp-var.c:1041
 msgid "Server Restarted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1067
+#: cgi-bin/ipp-var.c:1047
 msgid "Server Security Auditing"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1063
+#: cgi-bin/ipp-var.c:1043
 msgid "Server Started"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1065
+#: cgi-bin/ipp-var.c:1045
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/http-support.c:1405
+#: cups/http-support.c:1393
 msgid "Service Unavailable"
 msgstr ""
 
-#: cgi-bin/admin.c:2786 cgi-bin/admin.c:2832 cgi-bin/admin.c:2989
-#: cgi-bin/admin.c:3008
+#: cgi-bin/admin.c:2766 cgi-bin/admin.c:2812 cgi-bin/admin.c:2969
+#: cgi-bin/admin.c:2988
 msgid "Set Allowed Users"
 msgstr ""
 
-#: cgi-bin/admin.c:3035
+#: cgi-bin/admin.c:3015
 msgid "Set As Server Default"
 msgstr ""
 
-#: cgi-bin/admin.c:3135
+#: cgi-bin/admin.c:3115
 msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691
+#: cgi-bin/admin.c:3115 cgi-bin/admin.c:3289 cgi-bin/admin.c:3671
 msgid "Set Printer Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923
+#: cgi-bin/admin.c:3841 cgi-bin/admin.c:3885 cgi-bin/admin.c:3903
 msgid "Set Publishing"
 msgstr ""
 
@@ -5147,30 +5148,30 @@
 msgid "Shipping Address"
 msgstr ""
 
-#: ppdc/sample.c:273
+#: ppdc/sample.c:265
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:288
+#: ppdc/sample.c:283
 msgid "Special Paper"
 msgstr ""
 
-#: backend/lpd.c:1074
+#: backend/lpd.c:1065
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: ppdc/sample.c:341
+#: ppdc/sample.c:336
 msgid "Standard"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3552
+#: cgi-bin/admin.c:3532
 msgid "Starting Banner"
 msgstr ""
 
-#: filter/rastertoepson.c:1069 filter/rastertohp.c:793
-#: filter/rastertolabel.c:1219
+#: filter/rastertoepson.c:1054 filter/rastertohp.c:782
+#: filter/rastertolabel.c:1211
 #, c-format
 msgid "Starting page %d."
 msgstr ""
@@ -5179,21 +5180,21 @@
 msgid "Statement"
 msgstr ""
 
-#: ppdc/sample.c:251
+#: ppdc/sample.c:260
 msgid "Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:257
+#: ppdc/sample.c:266
 msgid "Stylus Photo Series"
 msgstr ""
 
-#: scheduler/ipp.c:3584 scheduler/ipp.c:6504 scheduler/ipp.c:7203
-#: scheduler/ipp.c:8703
+#: scheduler/ipp.c:3564 scheduler/ipp.c:6590 scheduler/ipp.c:7289
+#: scheduler/ipp.c:8790
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
 
-#: test/ippfind.c:2786
+#: test/ippfind.c:2798
 msgid "Substitutions:"
 msgstr ""
 
@@ -5209,7 +5210,7 @@
 msgid "Super B/A3"
 msgstr ""
 
-#: cups/http-support.c:1350
+#: cups/http-support.c:1338
 msgid "Switching Protocols"
 msgstr ""
 
@@ -5225,94 +5226,94 @@
 msgid "Tabloid Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:342
+#: ppdc/sample.c:337
 msgid "Tear"
 msgstr ""
 
-#: ppdc/sample.c:447
+#: ppdc/sample.c:442
 msgid "Tear-Off"
 msgstr ""
 
-#: ppdc/sample.c:388
+#: ppdc/sample.c:383
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
-#: scheduler/ipp.c:1341
+#: scheduler/ipp.c:1321
 #, c-format
 msgid "The \"%s\" attribute is required for print jobs."
 msgstr ""
 
-#: scheduler/ipp.c:6219 scheduler/ipp.c:6297 scheduler/ipp.c:6313
-#: scheduler/ipp.c:6331
+#: scheduler/ipp.c:6250 scheduler/ipp.c:6330 scheduler/ipp.c:6343
+#: scheduler/ipp.c:6355 scheduler/ipp.c:6370
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
 
-#: scheduler/ipp.c:1317
+#: scheduler/ipp.c:1297
 #, c-format
 msgid ""
 "The '%s' Job Description attribute cannot be supplied in a job creation "
 "request."
 msgstr ""
 
-#: scheduler/ipp.c:5157
+#: scheduler/ipp.c:5183
 #, c-format
 msgid ""
 "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:6734
+#: scheduler/ipp.c:6820
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:6721
+#: scheduler/ipp.c:6807
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
 
-#: filter/rastertoepson.c:1038 filter/rastertohp.c:764
-#: filter/rastertolabel.c:1183
+#: filter/rastertoepson.c:1023 filter/rastertohp.c:753
+#: filter/rastertolabel.c:1175
 msgid "The PPD file could not be opened."
 msgstr ""
 
-#: cgi-bin/admin.c:749
+#: cgi-bin/admin.c:727
 msgid ""
 "The class name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: cups/localize.c:353
+#: cups/localize.c:338
 msgid "The developer unit needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:351
+#: cups/localize.c:336
 msgid "The developer unit will need to be replaced soon."
 msgstr ""
 
-#: cups/localize.c:343
+#: cups/localize.c:328
 msgid "The fuser's temperature is high."
 msgstr ""
 
-#: cups/localize.c:345
+#: cups/localize.c:330
 msgid "The fuser's temperature is low."
 msgstr ""
 
-#: scheduler/ipp.c:2107
+#: scheduler/ipp.c:2088
 msgid ""
 "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: scheduler/ipp.c:2090 scheduler/ipp.c:5473
+#: scheduler/ipp.c:2071 scheduler/ipp.c:5499
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
 
-#: cups/localize.c:349
+#: cups/localize.c:334
 msgid "The optical photoconductor needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:347
+#: cups/localize.c:332
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr ""
 
@@ -5344,39 +5345,39 @@
 msgid "The paper tray needs to be filled."
 msgstr ""
 
-#: backend/ipp.c:941
+#: backend/ipp.c:981
 msgid ""
 "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
 
-#: backend/lpd.c:636 backend/lpd.c:1026 backend/lpd.c:1108 backend/lpd.c:1158
+#: backend/lpd.c:627 backend/lpd.c:1017 backend/lpd.c:1099 backend/lpd.c:1149
 msgid "The printer did not respond."
 msgstr ""
 
-#: backend/ipp.c:784 backend/ipp.c:904 backend/ipp.c:1018 backend/ipp.c:1409
-#: backend/ipp.c:1574 backend/lpd.c:845 backend/socket.c:384
-#: backend/usb-unix.c:131 backend/usb-unix.c:423 backend/usb-unix.c:506
+#: backend/ipp.c:825 backend/ipp.c:944 backend/ipp.c:1058 backend/ipp.c:1449
+#: backend/ipp.c:1614 backend/lpd.c:836 backend/socket.c:379
+#: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497
 msgid "The printer is in use."
 msgstr ""
 
-#: backend/runloop.c:254 backend/runloop.c:374 cups/localize.c:311
+#: backend/runloop.c:243 backend/runloop.c:363 cups/localize.c:296
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:762 backend/ipp.c:795 backend/ipp.c:900 backend/lpd.c:824
-#: backend/lpd.c:865 backend/socket.c:363 backend/socket.c:396
+#: backend/ipp.c:803 backend/ipp.c:836 backend/ipp.c:940 backend/lpd.c:815
+#: backend/lpd.c:856 backend/socket.c:358 backend/socket.c:391
 msgid "The printer is not responding."
 msgstr ""
 
-#: backend/runloop.c:396
+#: backend/runloop.c:385
 msgid "The printer is now connected."
 msgstr ""
 
-#: backend/usb-darwin.c:1299
+#: backend/usb-darwin.c:1300
 msgid "The printer is now online."
 msgstr ""
 
-#: backend/usb-darwin.c:1320
+#: backend/usb-darwin.c:1321
 msgid "The printer is offline."
 msgstr ""
 
@@ -5388,100 +5389,100 @@
 msgid "The printer is running low on toner."
 msgstr ""
 
-#: backend/ipp.c:777 backend/lpd.c:838 backend/socket.c:377
+#: backend/ipp.c:818 backend/lpd.c:829 backend/socket.c:372
 msgid "The printer is unreachable at this time."
 msgstr ""
 
-#: cups/localize.c:337
+#: cups/localize.c:322
 msgid "The printer may be out of ink."
 msgstr ""
 
-#: cups/localize.c:315
+#: cups/localize.c:300
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:771 backend/lpd.c:832 backend/socket.c:371
+#: backend/ipp.c:812 backend/lpd.c:823 backend/socket.c:366
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
-#: cgi-bin/admin.c:931
+#: cgi-bin/admin.c:909
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/ipp.c:808 scheduler/ipp.c:1068 scheduler/ipp.c:3225
-#: scheduler/ipp.c:3404 scheduler/ipp.c:5140 scheduler/ipp.c:5307
-#: scheduler/ipp.c:5621 scheduler/ipp.c:6185 scheduler/ipp.c:6939
-#: scheduler/ipp.c:6995 scheduler/ipp.c:7309 scheduler/ipp.c:7575
-#: scheduler/ipp.c:7664 scheduler/ipp.c:7697 scheduler/ipp.c:8020
-#: scheduler/ipp.c:8413 scheduler/ipp.c:8495 scheduler/ipp.c:9662
-#: scheduler/ipp.c:10116 scheduler/ipp.c:10447 scheduler/ipp.c:10529
-#: scheduler/ipp.c:10903
+#: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205
+#: scheduler/ipp.c:3384 scheduler/ipp.c:5166 scheduler/ipp.c:5333
+#: scheduler/ipp.c:5647 scheduler/ipp.c:6216 scheduler/ipp.c:7025
+#: scheduler/ipp.c:7081 scheduler/ipp.c:7395 scheduler/ipp.c:7661
+#: scheduler/ipp.c:7750 scheduler/ipp.c:7783 scheduler/ipp.c:8106
+#: scheduler/ipp.c:8500 scheduler/ipp.c:8582 scheduler/ipp.c:9747
+#: scheduler/ipp.c:10199 scheduler/ipp.c:10530 scheduler/ipp.c:10612
+#: scheduler/ipp.c:10987
 msgid "The printer or class does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:1254
+#: scheduler/ipp.c:1234
 msgid "The printer or class is not shared."
 msgstr ""
 
-#: cups/localize.c:317
+#: cups/localize.c:302
 msgid "The printer's cover is open."
 msgstr ""
 
-#: cups/localize.c:321
+#: cups/localize.c:306
 msgid "The printer's door is open."
 msgstr ""
 
-#: cups/localize.c:319
+#: cups/localize.c:304
 msgid "The printer's interlock is open."
 msgstr ""
 
-#: cups/localize.c:339
+#: cups/localize.c:324
 msgid "The printer's waste bin is almost full."
 msgstr ""
 
-#: cups/localize.c:341
+#: cups/localize.c:326
 msgid "The printer's waste bin is full."
 msgstr ""
 
-#: scheduler/ipp.c:914 scheduler/ipp.c:2271
+#: scheduler/ipp.c:894 scheduler/ipp.c:2252
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:3202
+#: scheduler/ipp.c:3182
 msgid "The printer-uri attribute is required."
 msgstr ""
 
-#: scheduler/ipp.c:898
+#: scheduler/ipp.c:878
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2255
+#: scheduler/ipp.c:2236
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
-#: cgi-bin/admin.c:474
+#: cgi-bin/admin.c:452
 msgid ""
 "The subscription name may not contain spaces, slashes (/), question marks "
 "(?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2533
+#: scheduler/client.c:2232
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
 msgstr ""
 
-#: scheduler/ipp.c:6280
+#: scheduler/ipp.c:6314
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:5551
+#: scheduler/ipp.c:5577
 msgid "There are too many subscriptions."
 msgstr ""
 
@@ -5490,53 +5491,53 @@
 msgstr ""
 
 #: backend/usb-darwin.c:386 backend/usb-darwin.c:445 backend/usb-darwin.c:514
-#: backend/usb-darwin.c:535 backend/usb-libusb.c:291 backend/usb-libusb.c:345
+#: backend/usb-darwin.c:535 backend/usb-libusb.c:271 backend/usb-libusb.c:325
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
-#: ppdc/sample.c:435
+#: ppdc/sample.c:430
 msgid "Thermal Transfer Media"
 msgstr ""
 
-#: scheduler/ipp.c:1499
+#: scheduler/ipp.c:1479
 msgid "Too many active jobs."
 msgstr ""
 
-#: scheduler/ipp.c:1393
+#: scheduler/ipp.c:1373
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
 
-#: scheduler/ipp.c:2556
+#: scheduler/ipp.c:2537
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: ppdc/sample.c:289
+#: ppdc/sample.c:284
 msgid "Transparency"
 msgstr ""
 
-#: ppdc/sample.c:284
+#: ppdc/sample.c:279
 msgid "Tray"
 msgstr ""
 
-#: ppdc/sample.c:264
+#: ppdc/sample.c:256
 msgid "Tray 1"
 msgstr ""
 
-#: ppdc/sample.c:265
+#: ppdc/sample.c:257
 msgid "Tray 2"
 msgstr ""
 
-#: ppdc/sample.c:266
+#: ppdc/sample.c:258
 msgid "Tray 3"
 msgstr ""
 
-#: ppdc/sample.c:267
+#: ppdc/sample.c:259
 msgid "Tray 4"
 msgstr ""
 
-#: cups/http-support.c:1390
+#: cups/http-support.c:1378
 msgid "URI Too Long"
 msgstr ""
 
@@ -5572,7 +5573,7 @@
 msgid "US Letter Small"
 msgstr ""
 
-#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996
+#: cgi-bin/admin.c:1939 cgi-bin/admin.c:1952 cgi-bin/admin.c:1976
 msgid "Unable to access cupsd.conf file"
 msgstr ""
 
@@ -5580,230 +5581,230 @@
 msgid "Unable to access help file."
 msgstr ""
 
-#: cgi-bin/admin.c:526
+#: cgi-bin/admin.c:504
 msgid "Unable to add RSS subscription"
 msgstr ""
 
-#: cgi-bin/admin.c:814
+#: cgi-bin/admin.c:792
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1757
+#: backend/ipp.c:1796
 msgid "Unable to add document to print job."
 msgstr ""
 
-#: scheduler/ipp.c:1558
+#: scheduler/ipp.c:1537
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr ""
 
-#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
+#: cgi-bin/admin.c:1037 cgi-bin/admin.c:1399
 msgid "Unable to add printer"
 msgstr ""
 
-#: scheduler/ipp.c:1184
+#: scheduler/ipp.c:1164
 msgid "Unable to allocate memory for file types."
 msgstr ""
 
-#: filter/pstops.c:451
+#: filter/pstops.c:418
 msgid "Unable to allocate memory for page info"
 msgstr ""
 
-#: filter/pstops.c:445
+#: filter/pstops.c:412
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: cgi-bin/admin.c:1525
+#: cgi-bin/admin.c:1505
 msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:2160
+#: backend/ipp.c:2077 backend/ipp.c:2512
 msgid "Unable to cancel print job."
 msgstr ""
 
-#: cgi-bin/admin.c:2990
+#: cgi-bin/admin.c:2970
 msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:3906
+#: cgi-bin/admin.c:3886
 msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
-#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799
+#: cgi-bin/admin.c:1637 cgi-bin/admin.c:1779
 msgid "Unable to change server settings"
 msgstr ""
 
-#: cups/ipp.c:5416
+#: cups/ipp.c:5389
 #, c-format
 msgid "Unable to compile mimeMediaType regular expression: %s."
 msgstr ""
 
-#: cups/ipp.c:5362
+#: cups/ipp.c:5335
 #, c-format
 msgid "Unable to compile naturalLanguage regular expression: %s."
 msgstr ""
 
-#: filter/commandtops.c:420
+#: filter/commandtops.c:407
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:911 cups/request.c:1082
+#: cups/adminutil.c:900 cups/request.c:1066
 msgid "Unable to connect to host."
 msgstr ""
 
-#: backend/ipp.c:740 backend/ipp.c:1214 backend/lpd.c:804 backend/socket.c:343
-#: backend/usb-unix.c:117
+#: backend/ipp.c:781 backend/ipp.c:1254 backend/lpd.c:795 backend/socket.c:338
+#: backend/usb-unix.c:110
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: cups/adminutil.c:726
+#: cups/adminutil.c:715
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:691
+#: cups/adminutil.c:680
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:522
+#: cups/adminutil.c:511
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2676
+#: scheduler/ipp.c:2657
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
-#: scheduler/ipp.c:2731
+#: scheduler/ipp.c:2712
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/adminutil.c:487
+#: cups/adminutil.c:476
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:610
+#: cups/adminutil.c:599
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2653
+#: scheduler/ipp.c:2634
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr ""
 
-#: cups/util.c:605 cups/util.c:1667
+#: cups/util.c:496 cups/util.c:1479
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1262
+#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1290
 msgid "Unable to create temporary file"
 msgstr ""
 
-#: cgi-bin/admin.c:2153
+#: cgi-bin/admin.c:2133
 msgid "Unable to delete class"
 msgstr ""
 
-#: cgi-bin/admin.c:2238
+#: cgi-bin/admin.c:2218
 msgid "Unable to delete printer"
 msgstr ""
 
-#: cgi-bin/classes.c:260 cgi-bin/printers.c:269
+#: cgi-bin/classes.c:252 cgi-bin/printers.c:261
 msgid "Unable to do maintenance command"
 msgstr ""
 
-#: cgi-bin/admin.c:1974
+#: cgi-bin/admin.c:1954
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/http.c:5354
+#: cups/tls-darwin.c:1284
 msgid ""
 "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/http.c:5344
+#: cups/tls-darwin.c:1274
 msgid ""
 "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/http.c:5339
+#: cups/tls-darwin.c:1269
 msgid ""
 "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/http.c:5349
+#: cups/tls-darwin.c:1279
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/http.c:5359
+#: cups/tls-darwin.c:1289
 msgid ""
 "Unable to establish a secure connection to host (peer dropped connection "
 "before responding)."
 msgstr ""
 
-#: cups/http.c:5334
+#: cups/tls-darwin.c:1264
 msgid ""
 "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/http.c:5329
+#: cups/tls-darwin.c:1259
 msgid ""
 "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/http.c:5130 cups/http.c:5386 cups/http.c:5423 cups/http.c:5442
+#: cups/tls-darwin.c:1316 cups/tls-sspi.c:1247 cups/tls-sspi.c:1264
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:365
+#: cgi-bin/ipp-var.c:350
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1830
+#: cups/http-support.c:1949
 msgid "Unable to find printer."
 msgstr ""
 
-#: backend/ipp.c:3435
+#: backend/ipp.c:3493
 msgid "Unable to get backend exit status."
 msgstr ""
 
-#: cgi-bin/classes.c:450
+#: cgi-bin/classes.c:442
 msgid "Unable to get class list"
 msgstr ""
 
-#: cgi-bin/classes.c:549
+#: cgi-bin/classes.c:541
 msgid "Unable to get class status"
 msgstr ""
 
-#: cgi-bin/admin.c:1320
+#: cgi-bin/admin.c:1300
 msgid "Unable to get list of printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2840
+#: cgi-bin/admin.c:2820
 msgid "Unable to get printer attributes"
 msgstr ""
 
-#: cgi-bin/printers.c:467
+#: cgi-bin/printers.c:459
 msgid "Unable to get printer list"
 msgstr ""
 
-#: cgi-bin/printers.c:569
+#: cgi-bin/printers.c:561
 msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:965
+#: backend/ipp.c:1005
 msgid "Unable to get printer status."
 msgstr ""
 
-#: cups/adminutil.c:565 cups/adminutil.c:769
+#: cups/adminutil.c:554 cups/adminutil.c:758
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:639
+#: cups/adminutil.c:628
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
@@ -5812,45 +5813,45 @@
 msgid "Unable to load help index."
 msgstr ""
 
-#: backend/ipp.c:665 backend/lpd.c:435 backend/socket.c:282
+#: backend/ipp.c:668 backend/lpd.c:426 backend/socket.c:277
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:790 backend/ipp.c:334 backend/lpd.c:205
-#: backend/socket.c:168
+#: backend/dnssd.c:787 backend/ipp.c:336 backend/lpd.c:196
+#: backend/socket.c:163
 msgid "Unable to locate printer."
 msgstr ""
 
-#: cgi-bin/admin.c:813
+#: cgi-bin/admin.c:791
 msgid "Unable to modify class"
 msgstr ""
 
-#: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418
+#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1398
 msgid "Unable to modify printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
+#: cgi-bin/ipp-var.c:417 cgi-bin/ipp-var.c:506
 msgid "Unable to move job"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523
+#: cgi-bin/ipp-var.c:419 cgi-bin/ipp-var.c:508
 msgid "Unable to move jobs"
 msgstr ""
 
-#: cgi-bin/admin.c:3186 cups/ppd.c:339
+#: cgi-bin/admin.c:3166 cups/ppd.c:297
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: cgi-bin/admin.c:2608
+#: cgi-bin/admin.c:2588
 msgid "Unable to open cupsd.conf file:"
 msgstr ""
 
-#: backend/usb-unix.c:141
+#: backend/usb-unix.c:134
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:5966
+#: scheduler/ipp.c:5992
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
@@ -5859,23 +5860,23 @@
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:376 backend/ipp.c:1503 backend/ipp.c:1712 backend/lpd.c:505
-#: backend/socket.c:155 backend/usb.c:237 filter/gziptoany.c:71
-#: filter/pstops.c:300
+#: backend/ipp.c:378 backend/ipp.c:1543 backend/ipp.c:1751 backend/lpd.c:496
+#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67
+#: filter/pstops.c:267
 msgid "Unable to open print file"
 msgstr ""
 
-#: filter/rastertoepson.c:998 filter/rastertohp.c:724
-#: filter/rastertolabel.c:1141
+#: filter/rastertoepson.c:983 filter/rastertohp.c:713
+#: filter/rastertolabel.c:1133
 msgid "Unable to open raster file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:795
+#: cgi-bin/ipp-var.c:780
 msgid "Unable to print test page"
 msgstr ""
 
-#: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:622
-#: backend/usb-darwin.c:666 backend/usb-libusb.c:436 backend/usb-libusb.c:471
+#: backend/runloop.c:85 backend/runloop.c:314 backend/usb-darwin.c:622
+#: backend/usb-darwin.c:666 backend/usb-libusb.c:416 backend/usb-libusb.c:451
 msgid "Unable to read print data."
 msgstr ""
 
@@ -5883,202 +5884,202 @@
 msgid "Unable to resolve printer URI."
 msgstr ""
 
-#: cups/adminutil.c:2088
+#: cups/adminutil.c:2077
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr ""
 
-#: filter/pstops.c:563
+#: filter/pstops.c:530
 msgid "Unable to see in file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618
+#: cgi-bin/ipp-var.c:583 cgi-bin/ipp-var.c:603
 msgid "Unable to send command to printer driver"
 msgstr ""
 
-#: backend/usb-darwin.c:744 backend/usb-libusb.c:547
+#: backend/usb-darwin.c:744 backend/usb-libusb.c:527
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: cups/adminutil.c:821
+#: cups/adminutil.c:810
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr ""
 
-#: cgi-bin/admin.c:3807
+#: cgi-bin/admin.c:3787
 msgid "Unable to set options"
 msgstr ""
 
-#: cgi-bin/admin.c:3077
+#: cgi-bin/admin.c:3057
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:3294 backend/ipp.c:3371 backend/ipp.c:3379
+#: backend/ipp.c:3352 backend/ipp.c:3429 backend/ipp.c:3437
 msgid "Unable to start backend process."
 msgstr ""
 
-#: cgi-bin/admin.c:1912
+#: cgi-bin/admin.c:1892
 msgid "Unable to upload cupsd.conf file"
 msgstr ""
 
-#: backend/usb-darwin.c:2014 backend/usb-darwin.c:2038
+#: backend/usb-darwin.c:2016 backend/usb-darwin.c:2040
 msgid "Unable to use legacy USB class driver."
 msgstr ""
 
-#: backend/runloop.c:125 backend/runloop.c:380
+#: backend/runloop.c:114 backend/runloop.c:369
 msgid "Unable to write print data"
 msgstr ""
 
-#: filter/gziptoany.c:90
+#: filter/gziptoany.c:86
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1378
+#: cups/http-support.c:1366
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3503
+#: cgi-bin/admin.c:3483
 msgid "Units"
 msgstr ""
 
-#: cups/http-support.c:1418 cups/ppd.c:366
+#: cups/http-support.c:1406 cups/http-support.c:1490 cups/ppd.c:324
 msgid "Unknown"
 msgstr ""
 
-#: filter/pstops.c:2214
+#: filter/pstops.c:2185
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:518
+#: backend/ipp.c:520
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:351
+#: backend/lpd.c:342
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:322
+#: backend/lpd.c:313
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/dest-options.c:984
+#: cups/dest-options.c:964
 msgid "Unknown media size name."
 msgstr ""
 
-#: backend/ipp.c:582
+#: backend/ipp.c:584
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2197
+#: filter/pstops.c:2168
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:337
+#: backend/lpd.c:328
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10318
+#: scheduler/ipp.c:10401
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10301
+#: scheduler/ipp.c:10384
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: cups/http-addrlist.c:746
+#: cups/http-addrlist.c:737
 msgid "Unknown service name."
 msgstr ""
 
-#: backend/ipp.c:547
+#: backend/ipp.c:549
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10774
+#: scheduler/ipp.c:10858
 #, c-format
 msgid "Unsupported 'compression' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10804
+#: scheduler/ipp.c:10888
 #, c-format
 msgid "Unsupported 'document-format' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10879
+#: scheduler/ipp.c:10963
 msgid "Unsupported 'job-name' value."
 msgstr ""
 
-#: scheduler/ipp.c:332
+#: scheduler/ipp.c:329
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:7986 scheduler/ipp.c:9223
+#: scheduler/ipp.c:8072 scheduler/ipp.c:9307
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8120 scheduler/ipp.c:9373
+#: scheduler/ipp.c:8206 scheduler/ipp.c:9457
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9356
+#: scheduler/ipp.c:9440
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1359
+#: scheduler/ipp.c:1339
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1457
+#: scheduler/ipp.c:1437
 msgid "Unsupported margins."
 msgstr ""
 
-#: cups/pwg-media.c:568
+#: cups/pwg-media.c:549
 msgid "Unsupported media value."
 msgstr ""
 
-#: filter/pstops.c:2479
+#: filter/pstops.c:2450
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr ""
 
-#: filter/pstops.c:2513
+#: filter/pstops.c:2484
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
 msgstr ""
 
-#: filter/pstops.c:2564
+#: filter/pstops.c:2535
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
 msgstr ""
 
-#: filter/rastertopwg.c:147 filter/rastertopwg.c:155 filter/rastertopwg.c:164
+#: filter/rastertopwg.c:139 filter/rastertopwg.c:147 filter/rastertopwg.c:156
 msgid "Unsupported raster data."
 msgstr ""
 
-#: cups/snmp.c:1108
+#: cups/snmp.c:1064
 msgid "Unsupported value type"
 msgstr ""
 
-#: cups/http-support.c:1393
+#: cups/http-support.c:1381
 msgid "Upgrade Required"
 msgstr ""
 
-#: systemv/lpadmin.c:668
+#: systemv/lpadmin.c:654
 msgid ""
 "Usage:\n"
 "\n"
@@ -6090,10 +6091,10 @@
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:242 backend/ipp.c:323 backend/lpd.c:192
-#: backend/socket.c:132 backend/usb.c:183 filter/commandtops.c:74
-#: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62
-#: monitor/tbcp.c:61
+#: backend/dnssd.c:227 backend/ipp.c:325 backend/lpd.c:183
+#: backend/socket.c:127 backend/usb.c:183 filter/commandtops.c:63
+#: filter/gziptoany.c:46 filter/pstops.c:231 monitor/bcp.c:56
+#: monitor/tbcp.c:55
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr ""
@@ -6106,11 +6107,11 @@
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2001
+#: scheduler/main.c:2145
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1456
+#: scheduler/cupsfilter.c:1436
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr ""
 
@@ -6131,7 +6132,7 @@
 "Options:"
 msgstr ""
 
-#: test/ippfind.c:2726
+#: test/ippfind.c:2738
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
 "       ippfind [options] name[.regtype[.domain.]] ... [expression]\n"
@@ -6139,7 +6140,7 @@
 "       ippfind --version"
 msgstr ""
 
-#: test/ipptool.c:4706
+#: test/ipptool.c:4803
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -6147,7 +6148,7 @@
 msgid "Usage: lpmove job/src dest"
 msgstr ""
 
-#: systemv/lpoptions.c:553
+#: systemv/lpoptions.c:539
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -6166,12 +6167,12 @@
 "       lppasswd [-g groupname] -x [username]"
 msgstr ""
 
-#: berkeley/lpq.c:675
+#: berkeley/lpq.c:637
 msgid ""
 "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 
-#: ppdc/ppdc.cxx:435
+#: ppdc/ppdc.cxx:430
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
@@ -6183,7 +6184,7 @@
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:367
+#: ppdc/ppdmerge.cxx:361
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
@@ -6192,47 +6193,47 @@
 "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: backend/snmp.c:218
+#: backend/snmp.c:192
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr ""
 
-#: cups/snmp.c:1060
+#: cups/snmp.c:1016
 msgid "Value uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1045
+#: cups/snmp.c:1001
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:995
+#: cups/snmp.c:951
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1858
+#: backend/ipp.c:1913
 msgid "Waiting for job to complete."
 msgstr ""
 
-#: backend/usb-darwin.c:469 backend/usb-libusb.c:243
+#: backend/usb-darwin.c:469 backend/usb-libusb.c:223
 msgid "Waiting for printer to become available."
 msgstr ""
 
-#: backend/socket.c:443
+#: backend/socket.c:440
 msgid "Waiting for printer to finish."
 msgstr ""
 
-#: cups/adminutil.c:793
+#: cups/adminutil.c:782
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/http-support.c:1414
+#: cups/http-support.c:1402
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd.c:1947
+#: cups/ppd.c:1902
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2520
+#: scheduler/client.c:2219
 #, c-format
 msgid ""
 "You must access this page using the URL <A "
@@ -6245,11 +6246,11 @@
 "username, and must contain at least one letter and number."
 msgstr ""
 
-#: ppdc/sample.c:439
+#: ppdc/sample.c:434
 msgid "ZPL Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:362
+#: ppdc/sample.c:357
 msgid "Zebra"
 msgstr ""
 
@@ -6265,11 +6266,11 @@
 msgid "completed"
 msgstr ""
 
-#: scheduler/ipp.c:5838
+#: scheduler/ipp.c:5864
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:6657 scheduler/ipp.c:6906
+#: scheduler/ipp.c:6743 scheduler/ipp.c:6992
 msgid "cups-driverd failed to execute."
 msgstr ""
 
@@ -6301,11 +6302,11 @@
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:259
+#: scheduler/main.c:258
 msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
 msgstr ""
 
-#: scheduler/main.c:270
+#: scheduler/main.c:269
 msgid "cupsd: Relative cups-files.conf filename not allowed."
 msgstr ""
 
@@ -6313,39 +6314,39 @@
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:317 scheduler/main.c:326
+#: scheduler/main.c:316 scheduler/main.c:325
 msgid "cupsd: Unable to get path to cups-files.conf file."
 msgstr ""
 
-#: scheduler/main.c:299
+#: scheduler/main.c:298
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:292
+#: scheduler/main.c:291
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:236
+#: scheduler/main.c:256
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1235
+#: scheduler/cupsfilter.c:1263
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1229
+#: scheduler/cupsfilter.c:1257
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:340
+#: scheduler/cupsfilter.c:348
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1277
+#: scheduler/cupsfilter.c:1305
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
@@ -6358,21 +6359,21 @@
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr ""
 
-#: systemv/lpstat.c:1279 systemv/lpstat.c:1282 systemv/lpstat.c:1285
+#: systemv/lpstat.c:1232 systemv/lpstat.c:1235 systemv/lpstat.c:1238
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1266 systemv/lpstat.c:1269 systemv/lpstat.c:1272
+#: systemv/lpstat.c:1218 systemv/lpstat.c:1221 systemv/lpstat.c:1224
 #, c-format
 msgid "device for %s: %s"
 msgstr ""
 
-#: cups/snmp.c:1032
+#: cups/snmp.c:988
 msgid "error-index uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1024
+#: cups/snmp.c:980
 msgid "error-status uses indefinite length"
 msgstr ""
 
@@ -6380,7 +6381,7 @@
 msgid "held"
 msgstr ""
 
-#: berkeley/lpc.c:209
+#: berkeley/lpc.c:201
 msgid "help\t\tGet help on commands."
 msgstr ""
 
@@ -6388,297 +6389,297 @@
 msgid "idle"
 msgstr ""
 
-#: test/ippfind.c:2458
+#: test/ippfind.c:2465
 #, c-format
 msgid "ippfind: Bad regular expression: %s"
 msgstr ""
 
-#: test/ippfind.c:347
+#: test/ippfind.c:328
 msgid "ippfind: Cannot use --and after --or."
 msgstr ""
 
-#: test/ippfind.c:620
+#: test/ippfind.c:601
 #, c-format
 msgid "ippfind: Expected key name after %s."
 msgstr ""
 
-#: test/ippfind.c:570 test/ippfind.c:753
+#: test/ippfind.c:551 test/ippfind.c:734
 #, c-format
 msgid "ippfind: Expected port range after %s."
 msgstr ""
 
-#: test/ippfind.c:380
+#: test/ippfind.c:361
 #, c-format
 msgid "ippfind: Expected program after %s."
 msgstr ""
 
-#: test/ippfind.c:397
+#: test/ippfind.c:378
 #, c-format
 msgid "ippfind: Expected semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1977
+#: test/ippfind.c:1965
 msgid "ippfind: Missing close brace in substitution."
 msgstr ""
 
-#: test/ippfind.c:1074
+#: test/ippfind.c:1053
 msgid "ippfind: Missing close parenthesis."
 msgstr ""
 
-#: test/ippfind.c:354
+#: test/ippfind.c:335
 msgid "ippfind: Missing expression before \"--and\"."
 msgstr ""
 
-#: test/ippfind.c:467
+#: test/ippfind.c:448
 msgid "ippfind: Missing expression before \"--or\"."
 msgstr ""
 
-#: test/ippfind.c:891
+#: test/ippfind.c:871
 #, c-format
 msgid "ippfind: Missing key name after %s."
 msgstr ""
 
-#: test/ippfind.c:1045
+#: test/ippfind.c:1024
 msgid "ippfind: Missing open parenthesis."
 msgstr ""
 
-#: test/ippfind.c:921
+#: test/ippfind.c:901
 #, c-format
 msgid "ippfind: Missing program after %s."
 msgstr ""
 
-#: test/ippfind.c:366 test/ippfind.c:420 test/ippfind.c:449 test/ippfind.c:555
-#: test/ippfind.c:637 test/ippfind.c:652 test/ippfind.c:808 test/ippfind.c:823
-#: test/ippfind.c:846 test/ippfind.c:906
+#: test/ippfind.c:347 test/ippfind.c:401 test/ippfind.c:430 test/ippfind.c:536
+#: test/ippfind.c:618 test/ippfind.c:633 test/ippfind.c:788 test/ippfind.c:803
+#: test/ippfind.c:826 test/ippfind.c:886
 #, c-format
 msgid "ippfind: Missing regular expression after %s."
 msgstr ""
 
-#: test/ippfind.c:939
+#: test/ippfind.c:919
 #, c-format
 msgid "ippfind: Missing semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1924 test/ippfind.c:1949
+#: test/ippfind.c:1912 test/ippfind.c:1937
 msgid "ippfind: Out of memory."
 msgstr ""
 
-#: test/ippfind.c:1018
+#: test/ippfind.c:997
 msgid "ippfind: Too many parenthesis."
 msgstr ""
 
-#: test/ippfind.c:1287 test/ippfind.c:1423 test/ippfind.c:2545
+#: test/ippfind.c:1266 test/ippfind.c:1402 test/ippfind.c:2557
 #, c-format
 msgid "ippfind: Unable to browse or resolve: %s"
 msgstr ""
 
-#: test/ippfind.c:2036 test/ippfind.c:2063
+#: test/ippfind.c:2035 test/ippfind.c:2062
 #, c-format
 msgid "ippfind: Unable to execute \"%s\": %s"
 msgstr ""
 
-#: test/ippfind.c:1164 test/ippfind.c:1172 test/ippfind.c:1183
+#: test/ippfind.c:1143 test/ippfind.c:1151 test/ippfind.c:1162
 #, c-format
 msgid "ippfind: Unable to use Bonjour: %s"
 msgstr ""
 
-#: test/ippfind.c:2006
+#: test/ippfind.c:1994
 #, c-format
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-#: test/ipptool.c:372 test/ipptool.c:521 test/ipptool.c:545
+#: test/ipptool.c:373
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr ""
 
-#: test/ipptool.c:603
+#: test/ipptool.c:623
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:514
+#: test/ipptool.c:537
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:584
+#: test/ipptool.c:604
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:537
+#: test/ipptool.c:559
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:407
+#: test/ipptool.c:423
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:388
+#: test/ipptool.c:404
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:504
+#: test/ipptool.c:527
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:630
+#: test/ipptool.c:649
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:564
+#: test/ipptool.c:585
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/ipp.c:7653
+#: scheduler/ipp.c:7739
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
-#: systemv/lpadmin.c:131 systemv/lpadmin.c:375
+#: systemv/lpadmin.c:117 systemv/lpadmin.c:361
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:614
+#: systemv/lpadmin.c:600
 msgid "lpadmin: Expected PPD after \"-P\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:457
+#: systemv/lpadmin.c:443
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:364
+#: systemv/lpadmin.c:350
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:120
+#: systemv/lpadmin.c:106
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:558
+#: systemv/lpadmin.c:544
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:491
+#: systemv/lpadmin.c:477
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:574
+#: systemv/lpadmin.c:560
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:202
+#: systemv/lpadmin.c:188
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:221
+#: systemv/lpadmin.c:207
 msgid "lpadmin: Expected interface after \"-i\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:594
+#: systemv/lpadmin.c:580
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:274
+#: systemv/lpadmin.c:260
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:417
+#: systemv/lpadmin.c:403
 msgid "lpadmin: Expected name after \"-R\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:294
+#: systemv/lpadmin.c:280
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:313
+#: systemv/lpadmin.c:299
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:164
+#: systemv/lpadmin.c:150
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:525
+#: systemv/lpadmin.c:511
 msgid "lpadmin: Expected printer or class after \"-x\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:975
+#: systemv/lpadmin.c:961
 msgid "lpadmin: No member names were seen."
 msgstr ""
 
-#: systemv/lpadmin.c:762
+#: systemv/lpadmin.c:748
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:989
+#: systemv/lpadmin.c:975
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:175 systemv/lpadmin.c:324 systemv/lpadmin.c:536
+#: systemv/lpadmin.c:161 systemv/lpadmin.c:310 systemv/lpadmin.c:522
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:105
+#: systemv/lpadmin.c:91
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:96 systemv/lpadmin.c:149 systemv/lpadmin.c:253
-#: systemv/lpadmin.c:339 systemv/lpadmin.c:393 systemv/lpadmin.c:510
-#: systemv/lpadmin.c:647
+#: systemv/lpadmin.c:82 systemv/lpadmin.c:135 systemv/lpadmin.c:239
+#: systemv/lpadmin.c:325 systemv/lpadmin.c:379 systemv/lpadmin.c:496
+#: systemv/lpadmin.c:633
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpadmin.c:1330
+#: systemv/lpadmin.c:1314
 msgid "lpadmin: Unable to create temporary file"
 msgstr ""
 
-#: systemv/lpadmin.c:402
+#: systemv/lpadmin.c:388
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:1340
+#: systemv/lpadmin.c:1324
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr ""
 
-#: systemv/lpadmin.c:348
+#: systemv/lpadmin.c:334
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:656
+#: systemv/lpadmin.c:642
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:474
+#: systemv/lpadmin.c:460
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:629
+#: systemv/lpadmin.c:615
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:624
+#: systemv/lpadmin.c:610
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpadmin.c:580
+#: systemv/lpadmin.c:566
 msgid "lpadmin: Warning - content type list ignored."
 msgstr ""
 
-#: berkeley/lpc.c:76 berkeley/lpc.c:104 berkeley/lpc.c:140
+#: berkeley/lpc.c:68 berkeley/lpc.c:96 berkeley/lpc.c:132
 msgid "lpc> "
 msgstr ""
 
@@ -6740,26 +6741,26 @@
 msgid "lpmove: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244
+#: systemv/lpoptions.c:143 systemv/lpoptions.c:161 systemv/lpoptions.c:237
 msgid "lpoptions: No printers."
 msgstr ""
 
-#: systemv/lpoptions.c:219
+#: systemv/lpoptions.c:212
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:521
+#: systemv/lpoptions.c:507
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:529
+#: systemv/lpoptions.c:515
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr ""
 
-#: systemv/lpoptions.c:99
+#: systemv/lpoptions.c:92
 msgid "lpoptions: Unknown printer or class."
 msgstr ""
 
@@ -6817,36 +6818,36 @@
 msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
 msgstr ""
 
-#: systemv/lpstat.c:1076
+#: systemv/lpstat.c:1074
 #, c-format
 msgid ""
 "lpstat: error - %s environment variable names non-existent destination "
 "\"%s\"."
 msgstr ""
 
-#: systemv/lpstat.c:1012
+#: systemv/lpstat.c:1010
 #, c-format
 msgid "members of class %s:"
 msgstr ""
 
-#: berkeley/lpq.c:587
+#: berkeley/lpq.c:549
 msgid "no entries"
 msgstr ""
 
-#: systemv/lpstat.c:1080
+#: systemv/lpstat.c:1078
 msgid "no system default destination"
 msgstr ""
 
-#: scheduler/ipp.c:5522
+#: scheduler/ipp.c:5548
 msgid "notify-events not specified."
 msgstr ""
 
-#: scheduler/ipp.c:2044 scheduler/ipp.c:5427
+#: scheduler/ipp.c:2025 scheduler/ipp.c:5453
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2034 scheduler/ipp.c:5417
+#: scheduler/ipp.c:2015 scheduler/ipp.c:5443
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
@@ -6855,7 +6856,7 @@
 msgid "pending"
 msgstr ""
 
-#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
+#: ppdc/ppdc.cxx:108 ppdc/ppdpo.cxx:93
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
@@ -6865,7 +6866,7 @@
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:410
+#: ppdc/ppdc-source.cxx:367
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr ""
@@ -6875,380 +6876,380 @@
 msgid "ppdc: Bad font attribute: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1796
+#: ppdc/ppdc-source.cxx:1753
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1113
+#: ppdc/ppdc-source.cxx:1070
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2033
+#: ppdc/ppdc-source.cxx:1990
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2719
+#: ppdc/ppdc-source.cxx:2675
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1698
+#: ppdc/ppdc-source.cxx:1655
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:932
+#: ppdc/ppdc-source.cxx:889
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:955
+#: ppdc/ppdc-source.cxx:912
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:394
+#: ppdc/ppdc-source.cxx:351
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1093
+#: ppdc/ppdc-source.cxx:1050
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:447
+#: ppdc/ppdc-source.cxx:404
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:435
+#: ppdc/ppdc-source.cxx:392
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:503
+#: ppdc/ppdc-source.cxx:460
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:492
+#: ppdc/ppdc-source.cxx:449
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:514
+#: ppdc/ppdc-source.cxx:471
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:695
+#: ppdc/ppdc-source.cxx:652
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2905
+#: ppdc/ppdc-source.cxx:2861
 #, c-format
 msgid ""
 "ppdc: Expected driver type keyword following DriverType on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:826
+#: ppdc/ppdc-source.cxx:783
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1077
+#: ppdc/ppdc-source.cxx:1034
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1689
+#: ppdc/ppdc-source.cxx:1646
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1205
+#: ppdc/ppdc-source.cxx:1162
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2619
+#: ppdc/ppdc-source.cxx:2575
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1502
+#: ppdc/ppdc-source.cxx:1459
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1681
+#: ppdc/ppdc-source.cxx:1638
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:353
+#: ppdc/ppdc-source.cxx:310
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3277
+#: ppdc/ppdc-source.cxx:3233
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1058
+#: ppdc/ppdc-source.cxx:1015
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3108
+#: ppdc/ppdc-source.cxx:3064
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3141
+#: ppdc/ppdc-source.cxx:3097
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3231
+#: ppdc/ppdc-source.cxx:3187
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3294
+#: ppdc/ppdc-source.cxx:3250
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1156
+#: ppdc/ppdc-source.cxx:1113
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1245
+#: ppdc/ppdc-source.cxx:1202
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1782
+#: ppdc/ppdc-source.cxx:1739
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:479
+#: ppdc/ppdc-source.cxx:436
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1574
+#: ppdc/ppdc-source.cxx:1531
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1608
+#: ppdc/ppdc-source.cxx:1565
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1586
+#: ppdc/ppdc-source.cxx:1543
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1765
+#: ppdc/ppdc-source.cxx:1722
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353
+#: ppdc/ppdc-catalog.cxx:389 ppdc/ppdc-catalog.cxx:401
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1004
+#: ppdc/ppdc-source.cxx:961
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:572
+#: ppdc/ppdc-source.cxx:529
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1863
+#: ppdc/ppdc-source.cxx:1820
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
 "of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:361
+#: ppdc/ppdc-source.cxx:318
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1101
+#: ppdc/ppdc-source.cxx:1058
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2794
+#: ppdc/ppdc-source.cxx:2750
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3397
+#: ppdc/ppdc-source.cxx:3353
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:728
+#: ppdc/ppdc-source.cxx:685
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:372
+#: ppdc/ppdc-source.cxx:329
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1085
+#: ppdc/ppdc-source.cxx:1042
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:227
+#: ppdc/ppdc-source.cxx:184
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:972
+#: ppdc/ppdc-source.cxx:929
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:964
+#: ppdc/ppdc-source.cxx:921
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:980
+#: ppdc/ppdc-source.cxx:937
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1628
+#: ppdc/ppdc-source.cxx:1585
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1600
+#: ppdc/ppdc-source.cxx:1557
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123
+#: ppdc/ppdc.cxx:246 ppdc/ppdpo.cxx:123
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:187
+#: ppdc/ppdc.cxx:182
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:126
+#: ppdc/ppdc.cxx:121
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2412 ppdc/ppdc-source.cxx:2644
+#: ppdc/ppdc-source.cxx:2368 ppdc/ppdc-source.cxx:2600
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2513 ppdc/ppdc-source.cxx:2548
-#: ppdc/ppdc-source.cxx:2578
+#: ppdc/ppdc-source.cxx:2469 ppdc/ppdc-source.cxx:2504
+#: ppdc/ppdc-source.cxx:2534
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:418
+#: ppdc/ppdc-catalog.cxx:466
 #, c-format
 msgid ""
 "ppdc: Need a msgid line before any translation strings on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-driver.cxx:730
+#: ppdc/ppdc-driver.cxx:712
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1651 ppdc/ppdc-source.cxx:2882
-#: ppdc/ppdc-source.cxx:2968 ppdc/ppdc-source.cxx:3061
-#: ppdc/ppdc-source.cxx:3194 ppdc/ppdc-source.cxx:3327
+#: ppdc/ppdc-source.cxx:1608 ppdc/ppdc-source.cxx:2838
+#: ppdc/ppdc-source.cxx:2924 ppdc/ppdc-source.cxx:3017
+#: ppdc/ppdc-source.cxx:3150 ppdc/ppdc-source.cxx:3283
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1644
+#: ppdc/ppdc-source.cxx:1601
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:705
+#: ppdc/ppdc-source.cxx:662
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2495
+#: ppdc/ppdc-source.cxx:2451
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:374
+#: ppdc/ppdc.cxx:369
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:266
+#: ppdc/ppdc.cxx:261
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:287
+#: ppdc/ppdc.cxx:282
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
+#: ppdc/ppdc.cxx:298 ppdc/ppdc.cxx:304
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1730
+#: ppdc/ppdc-source.cxx:1687
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2651
+#: ppdc/ppdc-source.cxx:2607
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:198
+#: ppdc/ppdc.cxx:193
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:135
+#: ppdc/ppdc.cxx:130
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr ""
@@ -7258,108 +7259,108 @@
 msgid "ppdc: Unable to open %s: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2054
+#: ppdc/ppdc-source.cxx:2011
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:435
+#: ppdc/ppdc-catalog.cxx:483
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2924
+#: ppdc/ppdc-source.cxx:2880
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:906
+#: ppdc/ppdc-source.cxx:863
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3154
+#: ppdc/ppdc-source.cxx:3110
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:463
+#: ppdc/ppdc-catalog.cxx:511
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3408
+#: ppdc/ppdc-source.cxx:3364
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1014
+#: ppdc/ppdc-source.cxx:971
 #, c-format
 msgid ""
 "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2164
+#: ppdc/ppdc-source.cxx:2121
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:365
+#: ppdc/ppdc.cxx:360
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:380
+#: ppdc/ppdc.cxx:375
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:148
+#: ppdc/ppdc.cxx:143
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:136
+#: ppdc/ppdmerge.cxx:130
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:176
+#: ppdc/ppdmerge.cxx:170
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:160
+#: ppdc/ppdmerge.cxx:154
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr ""
 
-#: systemv/lpstat.c:1844
+#: systemv/lpstat.c:1777
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1833
+#: systemv/lpstat.c:1766
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1838
+#: systemv/lpstat.c:1771
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1969
+#: systemv/lpstat.c:1900
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1955
+#: systemv/lpstat.c:1886
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1962
+#: systemv/lpstat.c:1893
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
@@ -7368,29 +7369,29 @@
 msgid "processing"
 msgstr ""
 
-#: systemv/lp.c:668
+#: systemv/lp.c:662
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr ""
 
-#: cups/snmp.c:1016
+#: cups/snmp.c:972
 msgid "request-id uses indefinite length"
 msgstr ""
 
-#: systemv/lpstat.c:2103
+#: systemv/lpstat.c:2032
 msgid "scheduler is not running"
 msgstr ""
 
-#: systemv/lpstat.c:2099
+#: systemv/lpstat.c:2028
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:2159
+#: cups/adminutil.c:2148
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr ""
 
-#: berkeley/lpc.c:211
+#: berkeley/lpc.c:203
 msgid "status\t\tShow status of daemon and queue."
 msgstr ""
 
@@ -7398,12 +7399,12 @@
 msgid "stopped"
 msgstr ""
 
-#: systemv/lpstat.c:1054
+#: systemv/lpstat.c:1052
 #, c-format
 msgid "system default destination: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1051
+#: systemv/lpstat.c:1049
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr ""
@@ -7416,6 +7417,6 @@
 msgid "untitled"
 msgstr ""
 
-#: cups/snmp.c:1041
+#: cups/snmp.c:997
 msgid "variable-bindings uses indefinite length"
 msgstr ""
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/example-content.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/example-content.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/example-content.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/example-content.po	2015-08-14 07:59:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:19+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:21+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../data/examples.desktop.in.h:1
 msgid "Examples"
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/human-theme.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/human-theme.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/human-theme.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/human-theme.po	2015-08-14 07:59:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:24+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:25+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../index.theme.in.h:1
 msgid "Ubuntu default theme"
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/indicator-datetime.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/indicator-datetime.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/indicator-datetime.po	2014-07-09 09:30:47.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/indicator-datetime.po	2015-08-14 07:59:24.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 14:37+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:19+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
 #: ../src/formatter.cpp:234
@@ -39,7 +39,7 @@
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
 #. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:341
+#: ../src/formatter.cpp:243 ../src/utils.c:344
 msgid "%H:%M"
 msgstr ""
 
@@ -132,18 +132,16 @@
 msgid "%s (has alarms)"
 msgstr ""
 
-#: ../src/snap.cpp:272
+#: ../src/snap.cpp:132
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#. / alarm popup dialog's button to show the active alarm
-#: ../src/snap.cpp:286
+#: ../src/snap.cpp:101
 msgid "Show"
 msgstr "Кӑтарт"
 
-#. / alarm popup dialog's button to shut up the alarm
-#: ../src/snap.cpp:289
+#: ../src/snap.cpp:102
 msgid "Dismiss"
 msgstr ""
 
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/landscape-client.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/landscape-client.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/landscape-client.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/landscape-client.po	2015-08-14 07:59:22.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: landscape-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-28 14:58+0000\n"
+"POT-Creation-Date: 2015-01-08 22:43+0000\n"
 "PO-Revision-Date: 2014-03-23 09:55+0000\n"
 "Last-Translator: pentile <pentile@ya.ru>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:23+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:23+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../landscape/ui/controller/app.py:49
 msgid "Success."
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/language-selector.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/language-selector.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/language-selector.po	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/language-selector.po	2015-08-14 07:59:22.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-01 15:35+0000\n"
+"POT-Creation-Date: 2014-09-18 20:16+0000\n"
 "PO-Revision-Date: 2014-03-21 20:23+0000\n"
 "Last-Translator: pentile <pentile@ya.ru>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:57+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:05+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: cv\n"
 
 #. Hack for Chinese langpack split
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/libelf.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/libelf.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/libelf.po	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/libelf.po	2015-08-14 07:59:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 11:54+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:21+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../lib/errors.h:25
 msgid "no error"
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/Linux-PAM.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/Linux-PAM.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/Linux-PAM.po	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/Linux-PAM.po	2015-08-14 07:59:22.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:05+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:29+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: libpam_misc/misc_conv.c:33
 msgid "...Time is running out...\n"
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/newt.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/newt.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/newt.po	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/newt.po	2015-08-14 07:59:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:04+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:29+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../dialogboxes.c:49
 msgid "Ok"
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/update-manager.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/update-manager.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/update-manager.po	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/update-manager.po	2015-08-14 07:59:22.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2014-04-28 21:02+0000\n"
+"POT-Creation-Date: 2015-04-15 20:23+0000\n"
 "PO-Revision-Date: 2010-09-27 23:33+0000\n"
 "Last-Translator: Michael Vogt <michael.vogt@canonical.com>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:27+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:44+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: cv\n"
 
 #: ../UpdateManager/backend/InstallBackendAptdaemon.py:67
@@ -121,7 +121,7 @@
 msgid "Restart _Later"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:282
+#: ../UpdateManager/Dialogs.py:283
 msgid "_Restart Now…"
 msgstr ""
 
diff -Nru language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/usbcreator.po language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/usbcreator.po
--- language-pack-cv-base-14.04+20140707/data/cv/LC_MESSAGES/usbcreator.po	2014-07-09 09:30:46.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/data/cv/LC_MESSAGES/usbcreator.po	2015-08-14 07:59:23.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-05-26 22:59+0000\n"
+"POT-Creation-Date: 2015-04-29 13:11+0000\n"
 "PO-Revision-Date: 2010-09-07 17:40+0000\n"
 "Last-Translator: Colin Watson <cjwatson@canonical.com>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 14:17+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:03+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
 msgid "Install the bootloader"
@@ -49,47 +49,55 @@
 msgid "System policy prevents mounting"
 msgstr ""
 
-#: .././desktop/usb-creator-gtk.desktop.in.h:1
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:9
+msgid "Run KVM"
+msgstr ""
+
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:10
+msgid "System policy prevents running KVM"
+msgstr ""
+
 #: .././desktop/usb-creator-kde.desktop.in.h:1
+#: .././desktop/usb-creator-gtk.desktop.in.h:1
 msgid "Startup Disk Creator"
 msgstr ""
 
-#: .././desktop/usb-creator-gtk.desktop.in.h:2
 #: .././desktop/usb-creator-kde.desktop.in.h:2
+#: .././desktop/usb-creator-gtk.desktop.in.h:2
 msgid "Create a startup disk using a CD or disc image"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. set title of progress window (same as gtk frontend)
-#: .././usbcreator/frontends/kde/frontend.py:209
 #: .././usbcreator/frontends/winui/install_window.py:23
-#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:209
+#: .././usbcreator/frontends/kde/frontend.py:180
+#: .././gui/usbcreator-gtk.ui.h:7 usbcreator/frontends/kde/frontend.py:180
 msgid "Installing"
 msgstr "Lartassi"
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO evand 2009-07-28: Better error message.
-#: .././usbcreator/frontends/kde/frontend.py:237
-#: .././usbcreator/frontends/gtk/frontend.py:735
-#: .././usbcreator/frontends/winui/frontend.py:87
-#: usbcreator/frontends/kde/frontend.py:237
+#: .././usbcreator/frontends/gtk/frontend.py:685
+#: .././usbcreator/frontends/winui/frontend.py:85
+#: .././usbcreator/frontends/kde/frontend.py:208
+#: usbcreator/frontends/kde/frontend.py:208
 msgid "Installation failed."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:413
-#: .././usbcreator/frontends/gtk/frontend.py:472
-#: usbcreator/frontends/kde/frontend.py:413
+#: .././usbcreator/frontends/gtk/frontend.py:444
+#: .././usbcreator/frontends/kde/frontend.py:368
+#: usbcreator/frontends/kde/frontend.py:368
 msgid "The device is not large enough to hold this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:415
-#: .././usbcreator/frontends/gtk/frontend.py:474
-#: usbcreator/frontends/kde/frontend.py:415
+#: .././usbcreator/frontends/gtk/frontend.py:446
+#: .././usbcreator/frontends/kde/frontend.py:370
+#: usbcreator/frontends/kde/frontend.py:370
 msgid "There is not enough free space for this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:418
-#: usbcreator/frontends/kde/frontend.py:418
+#: .././usbcreator/frontends/kde/frontend.py:373
+#: usbcreator/frontends/kde/frontend.py:373
 msgid "The device needs to be formatted for use."
 msgstr ""
 
@@ -97,58 +105,58 @@
 #. TODO evand 2009-07-28: The list itself needs to be moved into the
 #. base frontend.
 #. To be displayed as a list of file type filters.
-#: .././usbcreator/frontends/kde/frontend.py:452
-#: .././usbcreator/frontends/gtk/frontend.py:628
-#: .././usbcreator/frontends/winui/frontend.py:181
-#: usbcreator/frontends/kde/frontend.py:452
+#: .././usbcreator/frontends/gtk/frontend.py:585
+#: .././usbcreator/frontends/winui/frontend.py:177
+#: .././usbcreator/frontends/kde/frontend.py:406
+#: usbcreator/frontends/kde/frontend.py:406
 msgid "CD Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:452
-#: .././usbcreator/frontends/gtk/frontend.py:629
-#: .././usbcreator/frontends/winui/frontend.py:182
-#: usbcreator/frontends/kde/frontend.py:452
+#: .././usbcreator/frontends/gtk/frontend.py:585
+#: .././usbcreator/frontends/winui/frontend.py:178
+#: .././usbcreator/frontends/kde/frontend.py:406
+#: usbcreator/frontends/kde/frontend.py:406
 msgid "Disk Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:480
-#: usbcreator/frontends/kde/frontend.py:480
+#: .././usbcreator/frontends/kde/frontend.py:422
+#: usbcreator/frontends/kde/frontend.py:422
 msgid "Starting up"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:489
-#: usbcreator/frontends/kde/frontend.py:489
+#: .././usbcreator/frontends/kde/frontend.py:431
+#: usbcreator/frontends/kde/frontend.py:431
 msgid "You must select both source image and target device first."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:516
-#: .././usbcreator/frontends/winui/frontend.py:73
-#: usbcreator/frontends/kde/frontend.py:516
+#: .././usbcreator/frontends/winui/frontend.py:71
+#: .././usbcreator/frontends/kde/frontend.py:458
+#: usbcreator/frontends/kde/frontend.py:458
 msgid ""
 "The installation is complete.  You may now reboot your computer with this "
 "device inserted to try or install Ubuntu."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:527
-#: usbcreator/frontends/kde/frontend.py:527
+#: .././usbcreator/frontends/kde/frontend.py:469
+#: usbcreator/frontends/kde/frontend.py:469
 msgid "Retry?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:539
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:539
+#: .././usbcreator/frontends/kde/frontend.py:481
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:481
 msgid "Quit the installation?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:540
-#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:540
+#: .././usbcreator/frontends/kde/frontend.py:482
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:482
 msgid "Do you really want to quit the installation now?"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO information about the device we're about to format.
-#: .././usbcreator/frontends/kde/frontend.py:571
-#: .././usbcreator/frontends/gtk/frontend.py:796
-#: usbcreator/frontends/kde/frontend.py:571
+#: .././usbcreator/frontends/gtk/frontend.py:742
+#: .././usbcreator/frontends/kde/frontend.py:515
+#: usbcreator/frontends/kde/frontend.py:515
 msgid "Are you sure you want to erase the entire disk?"
 msgstr ""
 
@@ -176,70 +184,71 @@
 msgid "Legal"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:370
+#: .././usbcreator/frontends/gtk/frontend.py:347 usbcreator-kde.ui.py:12
 msgid "CD-Drive/Image"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:372
 #: .././usbcreator/frontends/winui/main_dialog.py:27
 msgid "Image"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:386
-#: .././usbcreator/frontends/winui/main_dialog.py:28
+#: .././usbcreator/frontends/gtk/frontend.py:360
+#: .././usbcreator/frontends/winui/main_dialog.py:28 usbcreator-kde.ui.py:15
 msgid "OS Version"
 msgstr "OS verssĕ"
 
-#: .././usbcreator/frontends/gtk/frontend.py:396
-#: .././usbcreator/frontends/winui/main_dialog.py:29
+#. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
+#. encode to UTF-8 to work around GNOME #620579
+#: .././usbcreator/frontends/gtk/frontend.py:371
+#: .././usbcreator/frontends/winui/main_dialog.py:29 usbcreator-kde.ui.py:18
 msgid "Size"
 msgstr "Pysăkăšĕ"
 
-#: .././usbcreator/frontends/gtk/frontend.py:513
-#: .././usbcreator/frontends/gtk/frontend.py:801
+#: .././usbcreator/frontends/gtk/frontend.py:478
+#: .././usbcreator/frontends/gtk/frontend.py:747
 msgid "Erasing..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:518
-#: .././gui/usbcreator-gtk.ui.h:16
+#: .././usbcreator/frontends/gtk/frontend.py:483
+#: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42
 msgid "Erase Disk"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:572
-#: .././usbcreator/frontends/winui/main_dialog.py:36
+#: .././usbcreator/frontends/gtk/frontend.py:537
+#: .././usbcreator/frontends/winui/main_dialog.py:36 usbcreator-kde.ui.py:30
 msgid "Device"
 msgstr "Hatĕr"
 
-#: .././usbcreator/frontends/gtk/frontend.py:589
-#: .././usbcreator/frontends/winui/main_dialog.py:37
+#: .././usbcreator/frontends/gtk/frontend.py:553
+#: .././usbcreator/frontends/winui/main_dialog.py:37 usbcreator-kde.ui.py:33
 msgid "Label"
 msgstr "Pallă"
 
-#: .././usbcreator/frontends/gtk/frontend.py:599
-#: .././usbcreator/frontends/winui/main_dialog.py:38
+#: .././usbcreator/frontends/gtk/frontend.py:563
+#: .././usbcreator/frontends/winui/main_dialog.py:38 usbcreator-kde.ui.py:36
 msgid "Capacity"
 msgstr "Aslăš"
 
-#: .././usbcreator/frontends/gtk/frontend.py:609
-#: .././usbcreator/frontends/winui/main_dialog.py:39
+#: .././usbcreator/frontends/gtk/frontend.py:573
+#: .././usbcreator/frontends/winui/main_dialog.py:39 usbcreator-kde.ui.py:39
 msgid "Free Space"
 msgstr ""
 
 #. TODO evand 2009-07-31: Make these the default values in the
 #. GtkBuilder file.
-#: .././usbcreator/frontends/gtk/frontend.py:650
+#: .././usbcreator/frontends/gtk/frontend.py:606
 #: .././usbcreator/frontends/winui/install_window.py:28
 msgid "Starting up..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:679
-#: .././usbcreator/frontends/winui/frontend.py:155
+#: .././usbcreator/frontends/gtk/frontend.py:635
+#: .././usbcreator/frontends/winui/frontend.py:151
 #, python-format
 msgid "%d%% complete (%dm%ss remaining)"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:683
-#: .././usbcreator/frontends/winui/frontend.py:159
+#: .././usbcreator/frontends/gtk/frontend.py:639
+#: .././usbcreator/frontends/winui/frontend.py:155
 #, python-format
 msgid "%d%% complete"
 msgstr ""
@@ -249,19 +258,19 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:21
-#: .././gui/usbcreator-gtk.ui.h:12
+#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:6
 msgid ""
 "To try or install Ubuntu from a removable disk, it needs to be set up as a "
 "startup disk."
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:24
-#: .././gui/usbcreator-gtk.ui.h:13
+#: .././gui/usbcreator-gtk.ui.h:12 usbcreator-kde.ui.py:9
 msgid "Source disc image (.iso) or CD:"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:32
-#: .././gui/usbcreator-gtk.ui.h:14
+#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:24
 msgid "Other..."
 msgstr ""
 
@@ -270,7 +279,7 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:42
-#: .././gui/usbcreator-gtk.ui.h:17
+#: .././gui/usbcreator-gtk.ui.h:16 usbcreator-kde.ui.py:45
 msgid "When starting up from this disk, documents and settings will be:"
 msgstr ""
 
@@ -279,16 +288,16 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:46
-#: .././gui/usbcreator-gtk.ui.h:19
+#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:51
 msgid "How much:"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:52
-#: .././gui/usbcreator-gtk.ui.h:20
+#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:57
 msgid "Discarded on shutdown, unless you save them elsewhere"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/main_dialog.py:56
+#: .././usbcreator/frontends/winui/main_dialog.py:56 usbcreator-kde.ui.py:63
 msgid "Quit"
 msgstr ""
 
@@ -300,24 +309,25 @@
 msgid "&Cancel"
 msgstr "&Părahăşla"
 
-#: .././usbcreator/frontends/winui/frontend.py:76
+#: .././usbcreator/frontends/winui/frontend.py:74
 msgid "Installation complete"
 msgstr "Lartsa pĕtertĕmĕr"
 
-#: .././usbcreator/frontends/winui/frontend.py:82
+#: .././usbcreator/frontends/winui/frontend.py:80
 msgid "Installation failed"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:183
+#: .././usbcreator/frontends/winui/frontend.py:179
 msgid "All"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:193
-#: .././gui/usbcreator-gtk.ui.h:11
+#: .././usbcreator/frontends/winui/frontend.py:189
+#: .././gui/usbcreator-gtk.ui.h:10 usbcreator-kde.ui.py:3
+#: usbcreator-kde.ui.py:60
 msgid "Make Startup Disk"
 msgstr ""
 
-#: .././usbcreator/install.py:140
+#: .././usbcreator/install.py:133
 #, python-format
 msgid "The extension \"%s\" is not supported."
 msgstr ""
@@ -327,14 +337,14 @@
 msgid "Missing matching \"%s\" for source image %s."
 msgstr ""
 
-#: .././usbcreator/install.py:161
+#: .././usbcreator/install.py:148
 #, python-format
 msgid ""
 "An uncaught exception was raised:\n"
 "%s"
 msgstr ""
 
-#: .././usbcreator/install.py:177
+#: .././usbcreator/install.py:164
 #, python-format
 msgid ""
 "Insufficient free space to write the image:\n"
@@ -343,48 +353,48 @@
 "(%d MB) > %s (%d MB)"
 msgstr ""
 
-#: .././usbcreator/install.py:230
+#: .././usbcreator/install.py:217
 msgid "Installing the bootloader..."
 msgstr ""
 
-#: .././usbcreator/install.py:231
+#: .././usbcreator/install.py:218
 msgid "Failed to install the bootloader."
 msgstr ""
 
-#: .././usbcreator/install.py:261
+#: .././usbcreator/install.py:248
 msgid "Modifying configuration..."
 msgstr ""
 
 #. Failure here probably means the source was not really an Ubuntu
 #. image and did not have the files we wanted to move, see
 #. <https://bugs.launchpad.net/launchpad-code/+bug/513432>
-#: .././usbcreator/install.py:272
+#: .././usbcreator/install.py:259
 #, python-format
 msgid ""
 "Could not move syslinux files in \"%s\": %s. Maybe \"%s\" is not an Ubuntu "
 "image?"
 msgstr ""
 
-#: .././usbcreator/install.py:343
+#: .././usbcreator/install.py:330
 msgid "Creating a persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:346
+#: .././usbcreator/install.py:333
 msgid "Creating an ext2 filesystem in the persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:358
+#: .././usbcreator/install.py:345
 msgid "Finishing..."
 msgstr ""
 
 #. TODO evand 2009-09-02: Disabled until we can find a cross-platform
 #. way of determining dd progress.
 #. self.initialize_progress_thread()
-#: .././usbcreator/install.py:381
+#: .././usbcreator/install.py:368
 msgid "Writing disk image..."
 msgstr ""
 
-#: .././usbcreator/install.py:382
+#: .././usbcreator/install.py:369
 #, python-format
 msgid "Could not write the disk image (%s) to the device (%s)."
 msgstr ""
@@ -412,23 +422,23 @@
 #. Clear.
 #. Some of the code in this function was copied from Ubiquity's
 #. scripts/install.py
-#: .././usbcreator/install.py:448 .././usbcreator/install.py:561
+#: .././usbcreator/install.py:410 .././usbcreator/install.py:523
 msgid "Removing files..."
 msgstr ""
 
-#: .././usbcreator/install.py:479 .././usbcreator/install.py:584
+#: .././usbcreator/install.py:441 .././usbcreator/install.py:546
 msgid "Copying files..."
 msgstr ""
 
-#: .././usbcreator/install.py:508
+#: .././usbcreator/install.py:470
 msgid "md5 checksums do not match."
 msgstr ""
 
-#: .././usbcreator/install.py:537
+#: .././usbcreator/install.py:499
 msgid "Installing the EFI bootloader..."
 msgstr ""
 
-#: .././usbcreator/install.py:538
+#: .././usbcreator/install.py:500
 msgid "Failed to install the EFI bootloader."
 msgstr ""
 
@@ -437,16 +447,16 @@
 #. user the option of selecting the re-inserted disk
 #. from a drop down list and continuing.
 #. TODO evand 2009-07-23: Fail more gracefully.
-#: .././usbcreator/install.py:656
+#: .././usbcreator/install.py:618
 #, python-format
 msgid "Could not read from %s"
 msgstr ""
 
-#: .././usbcreator/install.py:681
+#: .././usbcreator/install.py:643
 msgid "Checksums do not match.  Retry?"
 msgstr ""
 
-#: .././usbcreator/install.py:685
+#: .././usbcreator/install.py:647
 msgid "Checksums do not match."
 msgstr ""
 
@@ -454,57 +464,57 @@
 msgid "Legal Notice"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:2
+#: .././gui/usbcreator-gtk.ui.h:1
 msgid "Installation Failed"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:3
+#: .././gui/usbcreator-gtk.ui.h:2
 msgid ""
 "The installation failed.  Please see ~/.cache/usb-creator.log for more "
 "details.\n"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:5
+#: .././gui/usbcreator-gtk.ui.h:4
 msgid "Installation Complete"
 msgstr "Lartsa pĕtertĕmĕr"
 
-#: .././gui/usbcreator-gtk.ui.h:6
+#: .././gui/usbcreator-gtk.ui.h:5
 msgid "Test Disk"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:7
+#: .././gui/usbcreator-gtk.ui.h:6
 msgid ""
 "Installation is complete.  You may now run Ubuntu on other computers by "
 "booting them with this drive inserted."
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:15
+#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:27
 msgid "Disk to use:"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:18
+#: .././gui/usbcreator-gtk.ui.h:17 usbcreator-kde.ui.py:48
 msgid "Stored in reserved extra space"
 msgstr ""
 
-#: .././main.py:37
+#: .././main.py:38
 msgid "Please run this program as an administrator to continue."
 msgstr ""
 
-#: .././main.py:38
+#: .././main.py:39
 msgid "Administrator privileges required"
 msgstr ""
 
-#: .././main.py:55
+#: .././main.py:56
 #, python-format
 msgid ""
 "An unhandled exception occurred:\n"
 "%s"
 msgstr ""
 
-#: .././main.py:56
+#: .././main.py:57
 msgid "Error"
 msgstr "Jănăš"
 
-#: usbcreator/frontends/kde/frontend.py:207
+#: usbcreator/frontends/kde/frontend.py:178
 msgid "Cancel"
 msgstr "Părahăşla"
Binary files /tmp/yWT7fsVSyv/language-pack-cv-base-14.04+20140707/data/extra.tar and /tmp/n0gwArbKXt/language-pack-cv-base-14.04+20150804/data/extra.tar differ
diff -Nru language-pack-cv-base-14.04+20140707/debian/changelog language-pack-cv-base-14.04+20150804/debian/changelog
--- language-pack-cv-base-14.04+20140707/debian/changelog	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/debian/changelog	2015-08-14 07:59:22.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-cv-base (1:14.04+20140707) trusty-proposed; urgency=low
+language-pack-cv-base (1:14.04+20150804) trusty-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 09 Jul 2014 09:30:45 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 14 Aug 2015 07:59:22 +0000
 
diff -Nru language-pack-cv-base-14.04+20140707/debian/control language-pack-cv-base-14.04+20150804/debian/control
--- language-pack-cv-base-14.04+20140707/debian/control	2014-07-09 09:30:45.000000000 +0000
+++ language-pack-cv-base-14.04+20150804/debian/control	2015-08-14 07:59:22.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Language pack maintainers <language-packs@ubuntu.com>
 Build-Depends-Indep: gettext
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: language-pack-cv-base
 Architecture: all