Use curley single quotes, too.

diff --git a/locale/cups.pot b/locale/cups.pot
index 8096e4843ac5029f8b8717e1b835edc6382915bd..f72bd4ee96d73bc1f4cabc1d7fe9846caccbed31 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2530,23 +2530,23 @@ msgstr ""
 msgid "2 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:3108
+#: cups/ppd-cache.c:2992
 msgid "2-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3109
+#: cups/ppd-cache.c:2993
 msgid "2-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3107
+#: cups/ppd-cache.c:2991
 msgid "2-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3106
+#: cups/ppd-cache.c:2990
 msgid "2-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3778 ppdc/sample.c:262
+#: cups/ppd-cache.c:3662 ppdc/sample.c:262
 msgid "2-Sided Printing"
 msgstr ""
 
@@ -2698,19 +2698,19 @@ msgstr ""
 msgid "3 x 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3119
+#: cups/ppd-cache.c:3003
 msgid "3-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3117
+#: cups/ppd-cache.c:3001
 msgid "3-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3116
+#: cups/ppd-cache.c:3000
 msgid "3-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3118
+#: cups/ppd-cache.c:3002
 msgid "3-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -2802,19 +2802,19 @@ msgstr ""
 msgid "4 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:3113
+#: cups/ppd-cache.c:2997
 msgid "4-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3111
+#: cups/ppd-cache.c:2995
 msgid "4-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3110
+#: cups/ppd-cache.c:2994
 msgid "4-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3112
+#: cups/ppd-cache.c:2996
 msgid "4-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -3212,7 +3212,7 @@ msgstr ""
 msgid "Accepted"
 msgstr ""
 
-#: cups/ppd-cache.c:3089
+#: cups/ppd-cache.c:2973
 msgid "Accordian Fold"
 msgstr ""
 
@@ -3237,19 +3237,19 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: cups/ppd-cache.c:3539
+#: cups/ppd-cache.c:3423
 msgid "Advanced Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3453
+#: cups/ppd-cache.c:3337
 msgid "Alternate"
 msgstr ""
 
-#: cups/ppd-cache.c:3461
+#: cups/ppd-cache.c:3345
 msgid "Alternate Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3533
+#: cups/ppd-cache.c:3417
 msgid "Aluminum"
 msgstr ""
 
@@ -3265,19 +3265,19 @@ msgstr ""
 msgid "Applicator"
 msgstr ""
 
-#: cups/ppd-cache.c:3567
+#: cups/ppd-cache.c:3451
 msgid "Archival Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3579
+#: cups/ppd-cache.c:3463
 msgid "Archival Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3656
+#: cups/ppd-cache.c:3540
 msgid "Archival Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3628
+#: cups/ppd-cache.c:3512
 msgid "Archival Photo Paper"
 msgstr ""
 
@@ -3301,7 +3301,7 @@ msgstr ""
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
-#: cups/ppd-cache.c:3451 cups/ppd-cache.c:3534 cups/ppd-cache.c:3838
+#: cups/ppd-cache.c:3335 cups/ppd-cache.c:3418 cups/ppd-cache.c:3722
 msgid "Automatic"
 msgstr ""
 
@@ -3353,7 +3353,7 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: cups/ppd-cache.c:3535
+#: cups/ppd-cache.c:3419
 msgid "Back Print Film"
 msgstr ""
 
@@ -3378,16 +3378,16 @@ msgstr ""
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:457 cups/ppd-cache.c:504 cups/ppd-cache.c:589
-#: cups/ppd-cache.c:595 cups/ppd-cache.c:611 cups/ppd-cache.c:627
-#: cups/ppd-cache.c:636 cups/ppd-cache.c:644 cups/ppd-cache.c:661
-#: cups/ppd-cache.c:669 cups/ppd-cache.c:684 cups/ppd-cache.c:692
-#: cups/ppd-cache.c:713 cups/ppd-cache.c:725 cups/ppd-cache.c:740
-#: cups/ppd-cache.c:752 cups/ppd-cache.c:774 cups/ppd-cache.c:782
-#: cups/ppd-cache.c:800 cups/ppd-cache.c:808 cups/ppd-cache.c:823
-#: cups/ppd-cache.c:831 cups/ppd-cache.c:849 cups/ppd-cache.c:857
-#: cups/ppd-cache.c:884 cups/ppd-cache.c:954 cups/ppd-cache.c:962
-#: cups/ppd-cache.c:970
+#: cups/ppd-cache.c:456 cups/ppd-cache.c:503 cups/ppd-cache.c:541
+#: cups/ppd-cache.c:547 cups/ppd-cache.c:563 cups/ppd-cache.c:579
+#: cups/ppd-cache.c:588 cups/ppd-cache.c:596 cups/ppd-cache.c:613
+#: cups/ppd-cache.c:621 cups/ppd-cache.c:636 cups/ppd-cache.c:644
+#: cups/ppd-cache.c:665 cups/ppd-cache.c:677 cups/ppd-cache.c:692
+#: cups/ppd-cache.c:704 cups/ppd-cache.c:726 cups/ppd-cache.c:734
+#: cups/ppd-cache.c:752 cups/ppd-cache.c:760 cups/ppd-cache.c:775
+#: cups/ppd-cache.c:783 cups/ppd-cache.c:801 cups/ppd-cache.c:809
+#: cups/ppd-cache.c:836 cups/ppd-cache.c:906 cups/ppd-cache.c:914
+#: cups/ppd-cache.c:922
 msgid "Bad PPD cache file."
 msgstr ""
 
@@ -3559,7 +3559,7 @@ msgstr ""
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cups/ppd-cache.c:3074
+#: cups/ppd-cache.c:2958
 msgid "Bale"
 msgstr ""
 
@@ -3567,27 +3567,27 @@ msgstr ""
 msgid "Banners"
 msgstr ""
 
-#: cups/ppd-cache.c:3075
+#: cups/ppd-cache.c:2959
 msgid "Bind"
 msgstr ""
 
-#: cups/ppd-cache.c:3079
+#: cups/ppd-cache.c:2963
 msgid "Bind (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3077
+#: cups/ppd-cache.c:2961
 msgid "Bind (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3076
+#: cups/ppd-cache.c:2960
 msgid "Bind (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3078
+#: cups/ppd-cache.c:2962
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3568
+#: cups/ppd-cache.c:3452
 msgid "Bond Envelope"
 msgstr ""
 
@@ -3595,11 +3595,11 @@ msgstr ""
 msgid "Bond Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:4063
+#: cups/ppd-cache.c:3947
 msgid "Booklet"
 msgstr ""
 
-#: cups/ppd-cache.c:3080
+#: cups/ppd-cache.c:2964
 msgid "Booklet Maker"
 msgstr ""
 
@@ -3608,11 +3608,11 @@ msgstr ""
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3464
+#: cups/ppd-cache.c:3348
 msgid "Bottom"
 msgstr ""
 
-#: cups/ppd-cache.c:3839
+#: cups/ppd-cache.c:3723
 msgid "Bottom Tray"
 msgstr ""
 
@@ -3620,7 +3620,7 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: cups/ppd-cache.c:3538
+#: cups/ppd-cache.c:3422
 msgid "CD"
 msgstr ""
 
@@ -3652,11 +3652,11 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3536
+#: cups/ppd-cache.c:3420
 msgid "Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3537
+#: cups/ppd-cache.c:3421
 msgid "Cardstock"
 msgstr ""
 
@@ -3664,11 +3664,11 @@ msgstr ""
 msgid "Cassette"
 msgstr ""
 
-#: cups/ppd-cache.c:3468
+#: cups/ppd-cache.c:3352
 msgid "Center"
 msgstr ""
 
-#: cups/ppd-cache.c:3840
+#: cups/ppd-cache.c:3724
 msgid "Center Tray"
 msgstr ""
 
@@ -3694,28 +3694,28 @@ msgstr ""
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: cups/ppd-cache.c:3081
+#: cups/ppd-cache.c:2965
 msgid "Coat"
 msgstr ""
 
-#: cups/ppd-cache.c:3569
+#: cups/ppd-cache.c:3453
 msgid "Coated Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3657
+#: cups/ppd-cache.c:3541
 msgid "Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3742 ppdc/sample.c:276
+#: cups/ppd-cache.c:3626 ppdc/sample.c:276
 msgid "Color"
 msgstr ""
 
-#: cups/ppd-cache.c:3718 cups/ppd-cache.c:3729 cups/ppd-cache.c:3740
-#: cups/ppd-cache.c:3750 ppdc/sample.c:274
+#: cups/ppd-cache.c:3602 cups/ppd-cache.c:3613 cups/ppd-cache.c:3624
+#: cups/ppd-cache.c:3634 ppdc/sample.c:274
 msgid "Color Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:3604
+#: cups/ppd-cache.c:3488
 msgid "Colored Labels"
 msgstr ""
 
@@ -3742,15 +3742,15 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: cups/ppd-cache.c:3552 ppdc/sample.c:360
+#: cups/ppd-cache.c:3436 ppdc/sample.c:360
 msgid "Continuous"
 msgstr ""
 
-#: cups/ppd-cache.c:3553
+#: cups/ppd-cache.c:3437
 msgid "Continuous Long"
 msgstr ""
 
-#: cups/ppd-cache.c:3554
+#: cups/ppd-cache.c:3438
 msgid "Continuous Short"
 msgstr ""
 
@@ -3762,15 +3762,15 @@ msgstr ""
 msgid "Copying print data."
 msgstr ""
 
-#: cups/ppd-cache.c:3570
+#: cups/ppd-cache.c:3454
 msgid "Cotton Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3658
+#: cups/ppd-cache.c:3542
 msgid "Cotton Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3082
+#: cups/ppd-cache.c:2966
 msgid "Cover"
 msgstr ""
 
@@ -3778,11 +3778,11 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: cups/tls-darwin.c:726 cups/tls-gnutls.c:560
+#: cups/tls-darwin.c:728 cups/tls-gnutls.c:560
 msgid "Credentials do not validate against site CA certificate."
 msgstr ""
 
-#: cups/tls-darwin.c:737 cups/tls-gnutls.c:577
+#: cups/tls-darwin.c:739 cups/tls-gnutls.c:577
 msgid "Credentials have expired."
 msgstr ""
 
@@ -3802,7 +3802,7 @@ msgstr ""
 msgid "Cut"
 msgstr ""
 
-#: cups/ppd-cache.c:3138
+#: cups/ppd-cache.c:3022
 msgid "Cut Media"
 msgstr ""
 
@@ -3810,7 +3810,7 @@ msgstr ""
 msgid "Cutter"
 msgstr ""
 
-#: cups/ppd-cache.c:3563
+#: cups/ppd-cache.c:3447
 msgid "DVD"
 msgstr ""
 
@@ -3826,7 +3826,7 @@ msgstr ""
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cups/ppd-cache.c:3752
+#: cups/ppd-cache.c:3636
 msgid "Deep Color"
 msgstr ""
 
@@ -3891,7 +3891,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3457
+#: cups/ppd-cache.c:3341
 msgid "Disc"
 msgstr ""
 
@@ -3900,36 +3900,36 @@ msgstr ""
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: cups/ppd-cache.c:3090
+#: cups/ppd-cache.c:2974
 msgid "Double Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3131
+#: cups/ppd-cache.c:3015
 msgid "Double Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3129
+#: cups/ppd-cache.c:3013
 msgid "Double Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3128
+#: cups/ppd-cache.c:3012
 msgid "Double Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3130
+#: cups/ppd-cache.c:3014
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3561
+#: cups/ppd-cache.c:3445
 msgid "Double Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:4094 cups/ppd-cache.c:4149 cups/ppd-cache.c:4151
-#: cups/ppd-cache.c:4178
+#: cups/ppd-cache.c:3978 cups/ppd-cache.c:4033 cups/ppd-cache.c:4035
+#: cups/ppd-cache.c:4062
 msgid "Draft"
 msgstr ""
 
-#: cups/ppd-cache.c:3562
+#: cups/ppd-cache.c:3446
 msgid "Dry Film"
 msgstr ""
 
@@ -3955,7 +3955,7 @@ msgstr ""
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/ppd-cache.c:3564
+#: cups/ppd-cache.c:3448
 msgid "Embossing Foil"
 msgstr ""
 
@@ -3967,7 +3967,7 @@ msgstr ""
 msgid "Encryption is not supported."
 msgstr ""
 
-#: cups/ppd-cache.c:3565
+#: cups/ppd-cache.c:3449
 msgid "End Board"
 msgstr ""
 
@@ -3976,7 +3976,7 @@ msgstr ""
 msgid "Ending Banner"
 msgstr ""
 
-#: cups/ppd-cache.c:3091
+#: cups/ppd-cache.c:2975
 msgid "Engineering Z Fold"
 msgstr ""
 
@@ -3988,7 +3988,7 @@ msgstr ""
 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 valid Kerberos ticket."
 msgstr ""
 
-#: cups/ppd-cache.c:3456 cups/ppd-cache.c:3566
+#: cups/ppd-cache.c:3340 cups/ppd-cache.c:3450
 msgid "Envelope"
 msgstr ""
 
@@ -4269,11 +4269,11 @@ msgstr ""
 msgid "Every Label"
 msgstr ""
 
-#: cups/ppd-cache.c:3544
+#: cups/ppd-cache.c:3428
 msgid "Everyday Glossy Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3545
+#: cups/ppd-cache.c:3429
 msgid "Everyday Matte Paper"
 msgstr ""
 
@@ -4293,7 +4293,7 @@ msgstr ""
 msgid "Expressions:"
 msgstr ""
 
-#: cups/ppd-cache.c:3546
+#: cups/ppd-cache.c:3430
 msgid "Extra Heavyweight Paper"
 msgstr ""
 
@@ -4307,15 +4307,15 @@ msgstr ""
 msgid "FAIL"
 msgstr ""
 
-#: cups/ppd-cache.c:3578
+#: cups/ppd-cache.c:3462
 msgid "Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3841
+#: cups/ppd-cache.c:3725
 msgid "Face Down"
 msgstr ""
 
-#: cups/ppd-cache.c:3842
+#: cups/ppd-cache.c:3726
 msgid "Face Up"
 msgstr ""
 
@@ -4331,7 +4331,7 @@ msgstr ""
 msgid "Fanfold US"
 msgstr ""
 
-#: cups/ppd-cache.c:3720
+#: cups/ppd-cache.c:3604
 msgid "Fast Grayscale"
 msgstr ""
 
@@ -4369,11 +4369,11 @@ msgstr ""
 msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3585
+#: cups/ppd-cache.c:3469
 msgid "Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3571
+#: cups/ppd-cache.c:3455
 msgid "Fine Envelope"
 msgstr ""
 
@@ -4383,23 +4383,23 @@ msgstr ""
 msgid "Finished page %d."
 msgstr ""
 
-#: cups/ppd-cache.c:3586
+#: cups/ppd-cache.c:3470
 msgid "Flexo Base"
 msgstr ""
 
-#: cups/ppd-cache.c:3587
+#: cups/ppd-cache.c:3471
 msgid "Flexo Photo Polymer"
 msgstr ""
 
-#: cups/ppd-cache.c:3588
+#: cups/ppd-cache.c:3472
 msgid "Flute"
 msgstr ""
 
-#: cups/ppd-cache.c:3589
+#: cups/ppd-cache.c:3473
 msgid "Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:3088 cups/ppd-cache.c:3978
+#: cups/ppd-cache.c:2972 cups/ppd-cache.c:3862
 msgid "Fold"
 msgstr ""
 
@@ -4411,11 +4411,11 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
-#: cups/ppd-cache.c:3590
+#: cups/ppd-cache.c:3474
 msgid "Full Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:3092
+#: cups/ppd-cache.c:2976
 msgid "Gate Fold"
 msgstr ""
 
@@ -4431,39 +4431,39 @@ msgstr ""
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3591
+#: cups/ppd-cache.c:3475
 msgid "Glass"
 msgstr ""
 
-#: cups/ppd-cache.c:3592
+#: cups/ppd-cache.c:3476
 msgid "Glass Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3593
+#: cups/ppd-cache.c:3477
 msgid "Glass Opaque"
 msgstr ""
 
-#: cups/ppd-cache.c:3594
+#: cups/ppd-cache.c:3478
 msgid "Glass Surfaced"
 msgstr ""
 
-#: cups/ppd-cache.c:3595
+#: cups/ppd-cache.c:3479
 msgid "Glass Textured"
 msgstr ""
 
-#: cups/ppd-cache.c:3540
+#: cups/ppd-cache.c:3424
 msgid "Glossy Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3580
+#: cups/ppd-cache.c:3464
 msgid "Glossy Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3605
+#: cups/ppd-cache.c:3489
 msgid "Glossy Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3556
+#: cups/ppd-cache.c:3440
 msgid "Glossy Optical Disc"
 msgstr ""
 
@@ -4471,7 +4471,7 @@ msgstr ""
 msgid "Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3630
+#: cups/ppd-cache.c:3514
 msgid "Glossy Photo Paper"
 msgstr ""
 
@@ -4482,11 +4482,11 @@ msgstr ""
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: cups/ppd-cache.c:3596
+#: cups/ppd-cache.c:3480
 msgid "Gravure Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3731 ppdc/sample.c:275
+#: cups/ppd-cache.c:3615 ppdc/sample.c:275
 msgid "Grayscale"
 msgstr ""
 
@@ -4494,15 +4494,15 @@ msgstr ""
 msgid "HP"
 msgstr ""
 
-#: cups/ppd-cache.c:3459
+#: cups/ppd-cache.c:3343
 msgid "Hagaki"
 msgstr ""
 
-#: cups/ppd-cache.c:3093
+#: cups/ppd-cache.c:2977
 msgid "Half Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3094
+#: cups/ppd-cache.c:2978
 msgid "Half Z Fold"
 msgstr ""
 
@@ -4514,15 +4514,15 @@ msgstr ""
 msgid "Hash buffer too small."
 msgstr ""
 
-#: cups/ppd-cache.c:3661
+#: cups/ppd-cache.c:3545
 msgid "Heavyweight Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3572
+#: cups/ppd-cache.c:3456
 msgid "Heavyweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3660
+#: cups/ppd-cache.c:3544
 msgid "Heavyweight Paper"
 msgstr ""
 
@@ -4530,23 +4530,23 @@ msgstr ""
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ppd-cache.c:4104 cups/ppd-cache.c:4154 cups/ppd-cache.c:4181
+#: cups/ppd-cache.c:3988 cups/ppd-cache.c:4038 cups/ppd-cache.c:4065
 msgid "High"
 msgstr ""
 
-#: cups/ppd-cache.c:3581
+#: cups/ppd-cache.c:3465
 msgid "High Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3606
+#: cups/ppd-cache.c:3490
 msgid "High Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3557
+#: cups/ppd-cache.c:3441
 msgid "High Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3631
+#: cups/ppd-cache.c:3515
 msgid "High Gloss Photo Paper"
 msgstr ""
 
@@ -4666,23 +4666,23 @@ msgstr ""
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: cups/ppd-cache.c:3597
+#: cups/ppd-cache.c:3481
 msgid "Image Setter Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3598
+#: cups/ppd-cache.c:3482
 msgid "Imaging Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3573
+#: cups/ppd-cache.c:3457
 msgid "Inkjet Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3607
+#: cups/ppd-cache.c:3491
 msgid "Inkjet Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3662
+#: cups/ppd-cache.c:3546
 msgid "Inkjet Paper"
 msgstr ""
 
@@ -4885,7 +4885,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: cups/ppd-cache.c:3101
+#: cups/ppd-cache.c:2985
 msgid "Jog"
 msgstr ""
 
@@ -4901,15 +4901,15 @@ msgstr ""
 msgid "Label Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3603
+#: cups/ppd-cache.c:3487
 msgid "Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3102
+#: cups/ppd-cache.c:2986
 msgid "Laminate"
 msgstr ""
 
-#: cups/ppd-cache.c:3613
+#: cups/ppd-cache.c:3497
 msgid "Laminating Foil"
 msgstr ""
 
@@ -4922,11 +4922,11 @@ msgstr ""
 msgid "Large Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3454
+#: cups/ppd-cache.c:3338
 msgid "Large Capacity"
 msgstr ""
 
-#: cups/ppd-cache.c:3843
+#: cups/ppd-cache.c:3727
 msgid "Large Capacity Tray"
 msgstr ""
 
@@ -4934,19 +4934,19 @@ msgstr ""
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
-#: cups/ppd-cache.c:3466
+#: cups/ppd-cache.c:3350
 msgid "Left"
 msgstr ""
 
-#: cups/ppd-cache.c:3095
+#: cups/ppd-cache.c:2979
 msgid "Left Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3844
+#: cups/ppd-cache.c:3728
 msgid "Left Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3096
+#: cups/ppd-cache.c:2980
 msgid "Letter Fold"
 msgstr ""
 
@@ -4958,7 +4958,7 @@ msgstr ""
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3614 cups/ppd-cache.c:3663
+#: cups/ppd-cache.c:3498 cups/ppd-cache.c:3547
 msgid "Letterhead"
 msgstr ""
 
@@ -4966,11 +4966,11 @@ msgstr ""
 msgid "Light"
 msgstr ""
 
-#: cups/ppd-cache.c:3574
+#: cups/ppd-cache.c:3458
 msgid "Lightweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3664
+#: cups/ppd-cache.c:3548
 msgid "Lightweight Paper"
 msgstr ""
 
@@ -4990,7 +4990,7 @@ msgstr ""
 msgid "Local printer created."
 msgstr ""
 
-#: cups/ppd-cache.c:3778 ppdc/sample.c:264
+#: cups/ppd-cache.c:3662 ppdc/sample.c:264
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
@@ -4998,55 +4998,55 @@ msgstr ""
 msgid "Looking for printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3845
+#: cups/ppd-cache.c:3729
 msgid "Mailbox 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3854
+#: cups/ppd-cache.c:3738
 msgid "Mailbox 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3846
+#: cups/ppd-cache.c:3730
 msgid "Mailbox 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3847
+#: cups/ppd-cache.c:3731
 msgid "Mailbox 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3848
+#: cups/ppd-cache.c:3732
 msgid "Mailbox 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3849
+#: cups/ppd-cache.c:3733
 msgid "Mailbox 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3850
+#: cups/ppd-cache.c:3734
 msgid "Mailbox 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3851
+#: cups/ppd-cache.c:3735
 msgid "Mailbox 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3852
+#: cups/ppd-cache.c:3736
 msgid "Mailbox 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3853
+#: cups/ppd-cache.c:3737
 msgid "Mailbox 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3452
+#: cups/ppd-cache.c:3336
 msgid "Main"
 msgstr ""
 
-#: cups/ppd-cache.c:3460
+#: cups/ppd-cache.c:3344
 msgid "Main Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3455
+#: cups/ppd-cache.c:3339
 msgid "Manual"
 msgstr ""
 
@@ -5054,27 +5054,27 @@ msgstr ""
 msgid "Manual Feed"
 msgstr ""
 
-#: cups/ppd-cache.c:3541
+#: cups/ppd-cache.c:3425
 msgid "Matte Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3542
+#: cups/ppd-cache.c:3426
 msgid "Matte Cover Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3582
+#: cups/ppd-cache.c:3466
 msgid "Matte Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3608
+#: cups/ppd-cache.c:3492
 msgid "Matte Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3558
+#: cups/ppd-cache.c:3442
 msgid "Matte Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3632
+#: cups/ppd-cache.c:3516
 msgid "Matte Photo Paper"
 msgstr ""
 
@@ -5102,35 +5102,35 @@ msgstr ""
 msgid "Memory allocation error"
 msgstr ""
 
-#: cups/ppd-cache.c:3615
+#: cups/ppd-cache.c:3499
 msgid "Metal"
 msgstr ""
 
-#: cups/ppd-cache.c:3616
+#: cups/ppd-cache.c:3500
 msgid "Metal Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3617
+#: cups/ppd-cache.c:3501
 msgid "Metal High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3618
+#: cups/ppd-cache.c:3502
 msgid "Metal Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3619
+#: cups/ppd-cache.c:3503
 msgid "Metal Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3620
+#: cups/ppd-cache.c:3504
 msgid "Metal Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3548
+#: cups/ppd-cache.c:3432
 msgid "Mid-Weight Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3463 cups/ppd-cache.c:3855
+#: cups/ppd-cache.c:3347 cups/ppd-cache.c:3739
 msgid "Middle"
 msgstr ""
 
@@ -5240,7 +5240,7 @@ msgstr ""
 msgid "Modify Printer"
 msgstr ""
 
-#: cups/ppd-cache.c:3621
+#: cups/ppd-cache.c:3505
 msgid "Mounting Tape"
 msgstr ""
 
@@ -5256,39 +5256,39 @@ msgstr ""
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd-cache.c:3622
+#: cups/ppd-cache.c:3506
 msgid "Multi Layer"
 msgstr ""
 
-#: cups/ppd-cache.c:3623
+#: cups/ppd-cache.c:3507
 msgid "Multi Part Form"
 msgstr ""
 
-#: cups/ppd-cache.c:3123
+#: cups/ppd-cache.c:3007
 msgid "Multi-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3121
+#: cups/ppd-cache.c:3005
 msgid "Multi-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3120
+#: cups/ppd-cache.c:3004
 msgid "Multi-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3122
+#: cups/ppd-cache.c:3006
 msgid "Multi-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3470
+#: cups/ppd-cache.c:3354
 msgid "Multipurpose"
 msgstr ""
 
-#: cups/ppd-cache.c:3547
+#: cups/ppd-cache.c:3431
 msgid "Multipurpose Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3856
+#: cups/ppd-cache.c:3740
 msgid "My Mailbox"
 msgstr ""
 
@@ -5308,11 +5308,11 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: cups/tls-darwin.c:668 cups/tls-gnutls.c:502
+#: cups/tls-darwin.c:670 cups/tls-gnutls.c:502
 msgid "New credentials are not valid for name."
 msgstr ""
 
-#: cups/tls-darwin.c:658 cups/tls-gnutls.c:492
+#: cups/tls-darwin.c:660 cups/tls-gnutls.c:492
 msgid "New credentials are older than stored credentials."
 msgstr ""
 
@@ -5324,7 +5324,7 @@ msgstr ""
 msgid "No Content"
 msgstr ""
 
-#: cups/ppd-cache.c:3157
+#: cups/ppd-cache.c:3041
 msgid "No IPP attributes."
 msgstr ""
 
@@ -5361,7 +5361,7 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/tls-darwin.c:608 cups/tls-gnutls.c:439
+#: cups/tls-darwin.c:610 cups/tls-gnutls.c:439
 msgid "No common name specified."
 msgstr ""
 
@@ -5438,7 +5438,7 @@ msgstr ""
 msgid "No request-id"
 msgstr ""
 
-#: cups/tls-darwin.c:688 cups/tls-gnutls.c:522
+#: cups/tls-darwin.c:690 cups/tls-gnutls.c:522
 msgid "No stored credentials, not valid for name."
 msgstr ""
 
@@ -5466,11 +5466,11 @@ msgstr ""
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
-#: cups/ppd-cache.c:3934 cups/ppd-cache.c:3981 cups/ppd-cache.c:4028
+#: cups/ppd-cache.c:3818 cups/ppd-cache.c:3865 cups/ppd-cache.c:3912
 msgid "None"
 msgstr ""
 
-#: cups/ppd-cache.c:4097 cups/ppd-cache.c:4152 cups/ppd-cache.c:4179
+#: cups/ppd-cache.c:3981 cups/ppd-cache.c:4036 cups/ppd-cache.c:4063
 #: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
@@ -5511,11 +5511,11 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: cups/ppd-cache.c:3778 ppdc/sample.c:263
+#: cups/ppd-cache.c:3662 ppdc/sample.c:263
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: cups/ppd-cache.c:3543
+#: cups/ppd-cache.c:3427
 msgid "Office Recycled Paper"
 msgstr ""
 
@@ -5548,7 +5548,7 @@ msgstr ""
 msgid "Operation Policy"
 msgstr ""
 
-#: cups/ppd-cache.c:3555
+#: cups/ppd-cache.c:3439
 msgid "Optical Disc"
 msgstr ""
 
@@ -5569,15 +5569,15 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:3624
+#: cups/ppd-cache.c:3508
 msgid "Other"
 msgstr ""
 
-#: cups/ppd-cache.c:465
+#: cups/ppd-cache.c:464
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1945
+#: cups/ppd-cache.c:1861
 msgid "Out of memory."
 msgstr ""
 
@@ -5637,7 +5637,7 @@ msgstr ""
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: cups/ppd-cache.c:3625
+#: cups/ppd-cache.c:3509
 msgid "Paper"
 msgstr ""
 
@@ -5657,7 +5657,7 @@ msgstr ""
 msgid "Paper tray is missing."
 msgstr ""
 
-#: cups/ppd-cache.c:3097
+#: cups/ppd-cache.c:2981
 msgid "Parallel Fold"
 msgstr ""
 
@@ -5691,15 +5691,15 @@ msgstr ""
 msgid "Peel-Off"
 msgstr ""
 
-#: cups/ppd-cache.c:3609
+#: cups/ppd-cache.c:3493
 msgid "Permanent Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3458 ppdc/sample.c:160
+#: cups/ppd-cache.c:3342 ppdc/sample.c:160
 msgid "Photo"
 msgstr ""
 
-#: cups/ppd-cache.c:3629
+#: cups/ppd-cache.c:3513
 msgid "Photo Film"
 msgstr ""
 
@@ -5707,59 +5707,59 @@ msgstr ""
 msgid "Photo Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3626 cups/ppd-cache.c:3627
+#: cups/ppd-cache.c:3510 cups/ppd-cache.c:3511
 msgid "Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3599 cups/ppd-cache.c:3601
+#: cups/ppd-cache.c:3483 cups/ppd-cache.c:3485
 msgid "Photo Paper Plus Glossy II"
 msgstr ""
 
-#: cups/ppd-cache.c:3600 cups/ppd-cache.c:3602
+#: cups/ppd-cache.c:3484 cups/ppd-cache.c:3486
 msgid "Photo Paper Pro Platinum"
 msgstr ""
 
-#: cups/ppd-cache.c:3575
+#: cups/ppd-cache.c:3459
 msgid "Plain Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3655 ppdc/sample.c:281
+#: cups/ppd-cache.c:3539 ppdc/sample.c:281
 msgid "Plain Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3635
+#: cups/ppd-cache.c:3519
 msgid "Plastic"
 msgstr ""
 
-#: cups/ppd-cache.c:3636
+#: cups/ppd-cache.c:3520
 msgid "Plastic Archival"
 msgstr ""
 
-#: cups/ppd-cache.c:3637
+#: cups/ppd-cache.c:3521
 msgid "Plastic Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3638
+#: cups/ppd-cache.c:3522
 msgid "Plastic Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3639
+#: cups/ppd-cache.c:3523
 msgid "Plastic High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3640
+#: cups/ppd-cache.c:3524
 msgid "Plastic Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3641
+#: cups/ppd-cache.c:3525
 msgid "Plastic Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3642
+#: cups/ppd-cache.c:3526
 msgid "Plastic Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3643
+#: cups/ppd-cache.c:3527
 msgid "Plate"
 msgstr ""
 
@@ -5767,7 +5767,7 @@ msgstr ""
 msgid "Policies"
 msgstr ""
 
-#: cups/ppd-cache.c:3644
+#: cups/ppd-cache.c:3528
 msgid "Polyester"
 msgstr ""
 
@@ -5795,23 +5795,23 @@ msgstr ""
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3098
+#: cups/ppd-cache.c:2982
 msgid "Poster Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3645
+#: cups/ppd-cache.c:3529
 msgid "Pre Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:3549
+#: cups/ppd-cache.c:3433
 msgid "Premium Inkjet Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3550
+#: cups/ppd-cache.c:3434
 msgid "Premium Photo Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3551
+#: cups/ppd-cache.c:3435
 msgid "Premium Presentation Matte Paper"
 msgstr ""
 
@@ -5819,11 +5819,11 @@ msgstr ""
 msgid "Preparing to print."
 msgstr ""
 
-#: cups/ppd-cache.c:3576
+#: cups/ppd-cache.c:3460
 msgid "Preprinted Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3665
+#: cups/ppd-cache.c:3549
 msgid "Preprinted Paper"
 msgstr ""
 
@@ -5839,7 +5839,7 @@ msgstr ""
 msgid "Print Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:4090 cups/ppd-cache.c:4147 cups/ppd-cache.c:4176
+#: cups/ppd-cache.c:3974 cups/ppd-cache.c:4031 cups/ppd-cache.c:4060
 msgid "Print Quality"
 msgstr ""
 
@@ -5920,7 +5920,7 @@ msgstr ""
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
-#: cups/ppd-cache.c:4203
+#: cups/ppd-cache.c:4087
 msgid "Printer does not support required IPP attributes or document formats."
 msgstr ""
 
@@ -5938,11 +5938,11 @@ msgstr ""
 msgid "Printing page %d, %u%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3103 cups/ppd-cache.c:4025
+#: cups/ppd-cache.c:2987 cups/ppd-cache.c:3909
 msgid "Punch"
 msgstr ""
 
-#: cups/ppd-cache.c:3666
+#: cups/ppd-cache.c:3550
 msgid "Punched Paper"
 msgstr ""
 
@@ -5958,11 +5958,11 @@ msgstr ""
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
-#: cups/ppd-cache.c:3469
+#: cups/ppd-cache.c:3353
 msgid "Rear"
 msgstr ""
 
-#: cups/ppd-cache.c:3857
+#: cups/ppd-cache.c:3741
 msgid "Rear Tray"
 msgstr ""
 
@@ -6008,59 +6008,59 @@ msgstr ""
 msgid "Rewind"
 msgstr ""
 
-#: cups/ppd-cache.c:3467
+#: cups/ppd-cache.c:3351
 msgid "Right"
 msgstr ""
 
-#: cups/ppd-cache.c:3099
+#: cups/ppd-cache.c:2983
 msgid "Right Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3858
+#: cups/ppd-cache.c:3742
 msgid "Right Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3646
+#: cups/ppd-cache.c:3530
 msgid "Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3491
+#: cups/ppd-cache.c:3375
 msgid "Roll 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3500
+#: cups/ppd-cache.c:3384
 msgid "Roll 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3492
+#: cups/ppd-cache.c:3376
 msgid "Roll 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3493
+#: cups/ppd-cache.c:3377
 msgid "Roll 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3494
+#: cups/ppd-cache.c:3378
 msgid "Roll 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3495
+#: cups/ppd-cache.c:3379
 msgid "Roll 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3496
+#: cups/ppd-cache.c:3380
 msgid "Roll 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3497
+#: cups/ppd-cache.c:3381
 msgid "Roll 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3498
+#: cups/ppd-cache.c:3382
 msgid "Roll 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3499
+#: cups/ppd-cache.c:3383
 msgid "Roll 9"
 msgstr ""
 
@@ -6077,31 +6077,31 @@ msgstr ""
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/ppd-cache.c:3124
+#: cups/ppd-cache.c:3008
 msgid "Saddle Stitch"
 msgstr ""
 
-#: cups/ppd-cache.c:3610
+#: cups/ppd-cache.c:3494
 msgid "Satin Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3559
+#: cups/ppd-cache.c:3443
 msgid "Satin Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3633
+#: cups/ppd-cache.c:3517
 msgid "Satin Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3647
+#: cups/ppd-cache.c:3531
 msgid "Screen"
 msgstr ""
 
-#: cups/ppd-cache.c:3648
+#: cups/ppd-cache.c:3532
 msgid "Screen Paged"
 msgstr ""
 
-#: cups/ppd-cache.c:3611
+#: cups/ppd-cache.c:3495
 msgid "Security Labels"
 msgstr ""
 
@@ -6113,31 +6113,31 @@ msgstr ""
 msgid "See remote printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3649
+#: cups/ppd-cache.c:3533
 msgid "Self Adhesive"
 msgstr ""
 
-#: cups/ppd-cache.c:3650
+#: cups/ppd-cache.c:3534
 msgid "Self Adhesive Film"
 msgstr ""
 
-#: cups/tls-darwin.c:743 cups/tls-gnutls.c:584
+#: cups/tls-darwin.c:745 cups/tls-gnutls.c:584
 msgid "Self-signed credentials are blocked."
 msgstr ""
 
-#: cups/ppd-cache.c:3583
+#: cups/ppd-cache.c:3467
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3612
+#: cups/ppd-cache.c:3496
 msgid "Semi-Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3560
+#: cups/ppd-cache.c:3444
 msgid "Semi-Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3634
+#: cups/ppd-cache.c:3518
 msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
@@ -6161,7 +6161,7 @@ msgstr ""
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/tls-darwin.c:1183 cups/tls-gnutls.c:1263
+#: cups/tls-darwin.c:1185 cups/tls-gnutls.c:1263
 msgid "Server credentials not set."
 msgstr ""
 
@@ -6194,63 +6194,63 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3778 ppdc/sample.c:265
+#: cups/ppd-cache.c:3662 ppdc/sample.c:265
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3651
+#: cups/ppd-cache.c:3535
 msgid "Shrink Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:3465
+#: cups/ppd-cache.c:3349
 msgid "Side"
 msgstr ""
 
-#: cups/ppd-cache.c:3859
+#: cups/ppd-cache.c:3743
 msgid "Side Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3652
+#: cups/ppd-cache.c:3536
 msgid "Single Face"
 msgstr ""
 
-#: cups/ppd-cache.c:3115
+#: cups/ppd-cache.c:2999
 msgid "Single Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3114
+#: cups/ppd-cache.c:2998
 msgid "Single Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3104
+#: cups/ppd-cache.c:2988
 msgid "Single Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3105
+#: cups/ppd-cache.c:2989
 msgid "Single Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3133
+#: cups/ppd-cache.c:3017
 msgid "Single Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3132
+#: cups/ppd-cache.c:3016
 msgid "Single Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3126
+#: cups/ppd-cache.c:3010
 msgid "Single Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3127
+#: cups/ppd-cache.c:3011
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3653
+#: cups/ppd-cache.c:3537
 msgid "Single Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3654
+#: cups/ppd-cache.c:3538
 msgid "Sleeve"
 msgstr ""
 
@@ -6263,43 +6263,43 @@ msgstr ""
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3860
+#: cups/ppd-cache.c:3744
 msgid "Stacker 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3869
+#: cups/ppd-cache.c:3753
 msgid "Stacker 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3861
+#: cups/ppd-cache.c:3745
 msgid "Stacker 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3862
+#: cups/ppd-cache.c:3746
 msgid "Stacker 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3863
+#: cups/ppd-cache.c:3747
 msgid "Stacker 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3864
+#: cups/ppd-cache.c:3748
 msgid "Stacker 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3865
+#: cups/ppd-cache.c:3749
 msgid "Stacker 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3866
+#: cups/ppd-cache.c:3750
 msgid "Stacker 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3867
+#: cups/ppd-cache.c:3751
 msgid "Stacker 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3868
+#: cups/ppd-cache.c:3752
 msgid "Stacker 9"
 msgstr ""
 
@@ -6307,27 +6307,27 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: cups/ppd-cache.c:3125 cups/ppd-cache.c:3931
+#: cups/ppd-cache.c:3009 cups/ppd-cache.c:3815
 msgid "Staple"
 msgstr ""
 
-#: cups/ppd-cache.c:3083
+#: cups/ppd-cache.c:2967
 msgid "Staple Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3087
+#: cups/ppd-cache.c:2971
 msgid "Staple Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3085
+#: cups/ppd-cache.c:2969
 msgid "Staple Edge (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3084
+#: cups/ppd-cache.c:2968
 msgid "Staple Edge (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3086
+#: cups/ppd-cache.c:2970
 msgid "Staple Edge (Reverse Portrait)"
 msgstr ""
 
@@ -6372,7 +6372,7 @@ msgstr ""
 msgid "Switching Protocols"
 msgstr ""
 
-#: cups/ppd-cache.c:3667
+#: cups/ppd-cache.c:3551
 msgid "Tab Stock"
 msgstr ""
 
@@ -6628,23 +6628,23 @@ msgstr ""
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: cups/ppd-cache.c:3462
+#: cups/ppd-cache.c:3346
 msgid "Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3870
+#: cups/ppd-cache.c:3754
 msgid "Top Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3668
+#: cups/ppd-cache.c:3552
 msgid "Tractor"
 msgstr ""
 
-#: cups/ppd-cache.c:3669
+#: cups/ppd-cache.c:3553
 msgid "Transfer"
 msgstr ""
 
-#: cups/ppd-cache.c:3670 ppdc/sample.c:284
+#: cups/ppd-cache.c:3554 ppdc/sample.c:284
 msgid "Transparency"
 msgstr ""
 
@@ -6652,107 +6652,107 @@ msgstr ""
 msgid "Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3471 cups/ppd-cache.c:3871 ppdc/sample.c:256
+#: cups/ppd-cache.c:3355 cups/ppd-cache.c:3755 ppdc/sample.c:256
 msgid "Tray 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3480 cups/ppd-cache.c:3880
+#: cups/ppd-cache.c:3364 cups/ppd-cache.c:3764
 msgid "Tray 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3481
+#: cups/ppd-cache.c:3365
 msgid "Tray 11"
 msgstr ""
 
-#: cups/ppd-cache.c:3482
+#: cups/ppd-cache.c:3366
 msgid "Tray 12"
 msgstr ""
 
-#: cups/ppd-cache.c:3483
+#: cups/ppd-cache.c:3367
 msgid "Tray 13"
 msgstr ""
 
-#: cups/ppd-cache.c:3484
+#: cups/ppd-cache.c:3368
 msgid "Tray 14"
 msgstr ""
 
-#: cups/ppd-cache.c:3485
+#: cups/ppd-cache.c:3369
 msgid "Tray 15"
 msgstr ""
 
-#: cups/ppd-cache.c:3486
+#: cups/ppd-cache.c:3370
 msgid "Tray 16"
 msgstr ""
 
-#: cups/ppd-cache.c:3487
+#: cups/ppd-cache.c:3371
 msgid "Tray 17"
 msgstr ""
 
-#: cups/ppd-cache.c:3488
+#: cups/ppd-cache.c:3372
 msgid "Tray 18"
 msgstr ""
 
-#: cups/ppd-cache.c:3489
+#: cups/ppd-cache.c:3373
 msgid "Tray 19"
 msgstr ""
 
-#: cups/ppd-cache.c:3472 cups/ppd-cache.c:3872 ppdc/sample.c:257
+#: cups/ppd-cache.c:3356 cups/ppd-cache.c:3756 ppdc/sample.c:257
 msgid "Tray 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3490
+#: cups/ppd-cache.c:3374
 msgid "Tray 20"
 msgstr ""
 
-#: cups/ppd-cache.c:3473 cups/ppd-cache.c:3873 ppdc/sample.c:258
+#: cups/ppd-cache.c:3357 cups/ppd-cache.c:3757 ppdc/sample.c:258
 msgid "Tray 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3474 cups/ppd-cache.c:3874 ppdc/sample.c:259
+#: cups/ppd-cache.c:3358 cups/ppd-cache.c:3758 ppdc/sample.c:259
 msgid "Tray 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3475 cups/ppd-cache.c:3875
+#: cups/ppd-cache.c:3359 cups/ppd-cache.c:3759
 msgid "Tray 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3476 cups/ppd-cache.c:3876
+#: cups/ppd-cache.c:3360 cups/ppd-cache.c:3760
 msgid "Tray 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3477 cups/ppd-cache.c:3877
+#: cups/ppd-cache.c:3361 cups/ppd-cache.c:3761
 msgid "Tray 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3478 cups/ppd-cache.c:3878
+#: cups/ppd-cache.c:3362 cups/ppd-cache.c:3762
 msgid "Tray 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3479 cups/ppd-cache.c:3879
+#: cups/ppd-cache.c:3363 cups/ppd-cache.c:3763
 msgid "Tray 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3137
+#: cups/ppd-cache.c:3021
 msgid "Triple Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3135
+#: cups/ppd-cache.c:3019
 msgid "Triple Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3134
+#: cups/ppd-cache.c:3018
 msgid "Triple Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3136
+#: cups/ppd-cache.c:3020
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3671
+#: cups/ppd-cache.c:3555
 msgid "Triple Wall Cardboard"
 msgstr ""
 
-#: cups/tls-darwin.c:648 cups/tls-darwin.c:730 cups/tls-gnutls.c:482
+#: cups/tls-darwin.c:650 cups/tls-darwin.c:732 cups/tls-gnutls.c:482
 #: cups/tls-gnutls.c:564
 msgid "Trust on first use is disabled."
 msgstr ""
@@ -6915,7 +6915,7 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: cups/tls-darwin.c:614 cups/tls-gnutls.c:445
+#: cups/tls-darwin.c:616 cups/tls-gnutls.c:445
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -6927,7 +6927,7 @@ msgstr ""
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1444 cups/tls-gnutls.c:1475
+#: cups/tls-darwin.c:1446 cups/tls-gnutls.c:1475
 msgid "Unable to create server credentials."
 msgstr ""
 
@@ -6951,35 +6951,35 @@ msgstr ""
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1611
+#: cups/tls-darwin.c:1613
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1601
+#: cups/tls-darwin.c:1603
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1596
+#: cups/tls-darwin.c:1598
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1606
+#: cups/tls-darwin.c:1608
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1616
+#: cups/tls-darwin.c:1618
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1591
+#: cups/tls-darwin.c:1593
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1586
+#: cups/tls-darwin.c:1588
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1643 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
+#: cups/tls-darwin.c:1645 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
@@ -6991,7 +6991,7 @@ msgstr ""
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1457
+#: cups/tls-darwin.c:1459
 msgid "Unable to find server credentials."
 msgstr ""
 
@@ -7432,7 +7432,7 @@ msgstr ""
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3659
+#: cups/ppd-cache.c:3543
 msgid "Vellum Paper"
 msgstr ""
 
@@ -7456,7 +7456,7 @@ msgstr ""
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/ppd-cache.c:3584
+#: cups/ppd-cache.c:3468
 msgid "Waterproof Fabric"
 msgstr ""
 
@@ -7464,11 +7464,11 @@ msgstr ""
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3672
+#: cups/ppd-cache.c:3556
 msgid "Wet Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3577
+#: cups/ppd-cache.c:3461
 msgid "Windowed Envelope"
 msgstr ""
 
@@ -7481,7 +7481,7 @@ msgstr ""
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
 
-#: cups/ppd-cache.c:3100
+#: cups/ppd-cache.c:2984
 msgid "Z Fold"
 msgstr ""
 

diff --git a/locale/cups.strings b/locale/cups.strings
index 0f267cb9c4854aabe8e2a047fabdc022e8b7c4fb..acf6d6c3d46748f19ac23d7592a59754256a809d 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -25,7 +25,7 @@
 "\tUsers denied:" = "\tUsers denied:";
 "\tdaemon present" = "\tdaemon present";
 "\tno entries" = "\tno entries";
-"\tprinter is on device '%s' speed -1" = "\tprinter is on device '%s' speed -1";
+"\tprinter is on device '%s' speed -1" = "\tprinter is on device ‘s’speed -1";
 "\tprinting is disabled" = "\tprinting is disabled";
 "\tprinting is enabled" = "\tprinting is enabled";
 "\tqueued for %s" = "\tqueued for %s";
@@ -269,7 +269,7 @@
 "  -q                      Quietly report match via exit code." = "  -q                      Quietly report match via exit code.";
 "  -q                      Run silently." = "  -q                      Run silently.";
 "  -r                      True if service is remote." = "  -r                      True if service is remote.";
-"  -r                      Use 'relaxed' open mode." = "  -r                      Use 'relaxed' open mode.";
+"  -r                      Use 'relaxed' open mode." = "  -r                      Use ‘elaxed’open mode.";
 "  -s                      Print service name if true." = "  -s                      Print service name if true.";
 "  -s cups-files.conf      Set cups-files.conf file to use." = "  -s cups-files.conf      Set cups-files.conf file to use.";
 "  -t                      Produce a test report." = "  -t                      Produce a test report.";
@@ -314,7 +314,7 @@
 "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)." = "“%s”: Bad charset value “%s” - bad length %d (RFC 2911 section 4.1.7).";
 "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime UTC hours %u (RFC 2911 section 4.1.14).";
 "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14).";
+"\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime UTC sign ‘c’(RFC 2911 section 4.1.14).";
 "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime day %u (RFC 2911 section 4.1.14).";
 "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime deciseconds %u (RFC 2911 section 4.1.14).";
 "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)." = "“%s”: Bad dateTime hours %u (RFC 2911 section 4.1.14).";
@@ -364,9 +364,9 @@
 "%s: %s failed: %s" = "%s: %s failed: %s";
 "%s: Bad printer URI \"%s\"." = "%s: Bad printer URI “%s”.";
 "%s: Bad version %s for \"-V\"." = "%s: Bad version %s for “-V”.";
-"%s: Don't know what to do." = "%s: Don't know what to do.";
+"%s: Don't know what to do." = "%s: Don’ know what to do.";
 "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination “%s”.";
-"%s: Error - add '/version=1.1' to server name." = "%s: Error - add '/version=1.1' to server name.";
+"%s: Error - add '/version=1.1' to server name." = "%s: Error - add ‘version=1.1’to server name.";
 "%s: Error - bad job ID." = "%s: Error - bad job ID.";
 "%s: Error - cannot print files and alter jobs simultaneously." = "%s: Error - cannot print files and alter jobs simultaneously.";
 "%s: Error - cannot print from stdin if files or a job ID are provided." = "%s: Error - cannot print from stdin if files or a job ID are provided.";
@@ -719,7 +719,7 @@
 "B8" = "B8";
 "B9" = "B9";
 "Back Print Film" = "Back Print Film";
-"Bad 'document-format' value \"%s\"." = "Bad 'document-format' value “%s”.";
+"Bad 'document-format' value \"%s\"." = "Bad ‘ocument-format’value “%s”.";
 "Bad NULL dests pointer" = "Bad NULL dests pointer";
 "Bad OpenGroup" = "Bad OpenGroup";
 "Bad OpenUI/JCLOpenUI" = "Bad OpenUI/JCLOpenUI";
@@ -794,7 +794,7 @@
 "Character set \"%s\" not supported." = "Character set “%s” not supported.";
 "Classes" = "Classes";
 "Clean Print Heads" = "Clean Print Heads";
-"Close-Job doesn't support the job-uri attribute." = "Close-Job doesn't support the job-uri attribute.";
+"Close-Job doesn't support the job-uri attribute." = "Close-Job doesn’ support the job-uri attribute.";
 "Coat" = "Coat";
 "Coated Envelope" = "Coated Envelope";
 "Coated Paper" = "Coated Paper";
@@ -1064,9 +1064,9 @@
 "JIS B9" = "JIS B9";
 "Job #%d cannot be restarted - no files." = "Job #%d cannot be restarted - no files.";
 "Job #%d does not exist." = "Job #%d does not exist.";
-"Job #%d is already aborted - can't cancel." = "Job #%d is already aborted - can't cancel.";
-"Job #%d is already canceled - can't cancel." = "Job #%d is already canceled - can't cancel.";
-"Job #%d is already completed - can't cancel." = "Job #%d is already completed - can't cancel.";
+"Job #%d is already aborted - can't cancel." = "Job #%d is already aborted - can’ cancel.";
+"Job #%d is already canceled - can't cancel." = "Job #%d is already canceled - can’ cancel.";
+"Job #%d is already completed - can't cancel." = "Job #%d is already completed - can’ cancel.";
 "Job #%d is finished and cannot be altered." = "Job #%d is finished and cannot be altered.";
 "Job #%d is not complete." = "Job #%d is not complete.";
 "Job #%d is not held for authentication." = "Job #%d is not held for authentication.";
@@ -1368,7 +1368,7 @@
 "Roll 7" = "Roll 7";
 "Roll 8" = "Roll 8";
 "Roll 9" = "Roll 9";
-"Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c '%s'";
+"Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c â\80\98sâ\80\99\ 1\ 2d/ù\a\ 3";
 "SEQUENCE uses indefinite length" = "SEQUENCE uses indefinite length";
 "SSL/TLS Negotiation Error" = "SSL/TLS Negotiation Error";
 "Saddle Stitch" = "Saddle Stitch";
@@ -1453,16 +1453,16 @@
 "Tear-Off Adjust Position" = "Tear-Off Adjust Position";
 "The \"%s\" attribute is required for print jobs." = "The “%s” attribute is required for print jobs.";
 "The %s attribute cannot be provided with job-ids." = "The %s attribute cannot be provided with job-ids.";
-"The '%s' Job Status attribute cannot be supplied in a job creation request." = "The '%s' Job Status attribute cannot be supplied in a job creation request.";
-"The '%s' operation attribute cannot be supplied in a Create-Job request." = "The '%s' operation attribute cannot be supplied in a Create-Job request.";
+"The '%s' Job Status attribute cannot be supplied in a job creation request." = "The ‘s’Job Status attribute cannot be supplied in a job creation request.";
+"The '%s' operation attribute cannot be supplied in a Create-Job request." = "The ‘s’operation attribute cannot be supplied in a Create-Job request.";
 "The PPD file \"%s\" could not be found." = "The PPD file “%s” could not be found.";
 "The PPD file \"%s\" could not be opened: %s" = "The PPD file “%s” could not be opened: %s";
 "The PPD file could not be opened." = "The PPD file could not be opened.";
 "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#).";
 "The developer unit needs to be replaced." = "The developer unit needs to be replaced.";
 "The developer unit will need to be replaced soon." = "The developer unit will need to be replaced soon.";
-"The fuser's temperature is high." = "The fuser's temperature is high.";
-"The fuser's temperature is low." = "The fuser's temperature is low.";
+"The fuser's temperature is high." = "The fuser’ temperature is high.";
+"The fuser's temperature is low." = "The fuser’ temperature is low.";
 "The notify-lease-duration attribute cannot be used with job subscriptions." = "The notify-lease-duration attribute cannot be used with job subscriptions.";
 "The notify-user-data value is too large (%d > 63 octets)." = "The notify-user-data value is too large (%d > 63 octets).";
 "The optical photoconductor needs to be replaced." = "The optical photoconductor needs to be replaced.";
@@ -1484,11 +1484,11 @@
 "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#).";
 "The printer or class does not exist." = "The printer or class does not exist.";
 "The printer or class is not shared." = "The printer or class is not shared.";
-"The printer's cover is open." = "The printer's cover is open.";
-"The printer's door is open." = "The printer's door is open.";
-"The printer's interlock is open." = "The printer's interlock is open.";
-"The printer's waste bin is almost full." = "The printer's waste bin is almost full.";
-"The printer's waste bin is full." = "The printer's waste bin is full.";
+"The printer's cover is open." = "The printer’ cover is open.";
+"The printer's door is open." = "The printer’ door is open.";
+"The printer's interlock is open." = "The printer’ interlock is open.";
+"The printer's waste bin is almost full." = "The printer’ waste bin is almost full.";
+"The printer's waste bin is full." = "The printer’ waste bin is full.";
 "The printer-uri \"%s\" contains invalid characters." = "The printer-uri “%s” contains invalid characters.";
 "The printer-uri attribute is required." = "The printer-uri attribute is required.";
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." = "The printer-uri must be of the form “ipp://HOSTNAME/classes/CLASSNAME”.";
@@ -1650,9 +1650,9 @@
 "Unknown scheme in URI" = "Unknown scheme in URI";
 "Unknown service name." = "Unknown service name.";
 "Unknown version option value: \"%s\"." = "Unknown version option value: “%s”.";
-"Unsupported 'compression' value \"%s\"." = "Unsupported 'compression' value “%s”.";
-"Unsupported 'document-format' value \"%s\"." = "Unsupported 'document-format' value “%s”.";
-"Unsupported 'job-name' value." = "Unsupported 'job-name' value.";
+"Unsupported 'compression' value \"%s\"." = "Unsupported ‘ompression’value “%s”.";
+"Unsupported 'document-format' value \"%s\"." = "Unsupported ‘ocument-format’value “%s”.";
+"Unsupported 'job-name' value." = "Unsupported ‘ob-name’value.";
 "Unsupported character set \"%s\"." = "Unsupported character set “%s”.";
 "Unsupported compression \"%s\"." = "Unsupported compression “%s”.";
 "Unsupported document-format \"%s\"." = "Unsupported document-format “%s”.";
@@ -1889,7 +1889,7 @@
 "ppdc: Option %s defined in two different groups on line %d of %s." = "ppdc: Option %s defined in two different groups on line %d of %s.";
 "ppdc: Option %s redefined with a different type on line %d of %s." = "ppdc: Option %s redefined with a different type on line %d of %s.";
 "ppdc: Option constraint must *name on line %d of %s." = "ppdc: Option constraint must *name on line %d of %s.";
-"ppdc: Too many nested #if's on line %d of %s." = "ppdc: Too many nested #if's on line %d of %s.";
+"ppdc: Too many nested #if's on line %d of %s." = "ppdc: Too many nested #if’ on line %d of %s.";
 "ppdc: Unable to create PPD file \"%s\" - %s." = "ppdc: Unable to create PPD file “%s” - %s.";
 "ppdc: Unable to create output directory %s: %s" = "ppdc: Unable to create output directory %s: %s";
 "ppdc: Unable to create output pipes: %s" = "ppdc: Unable to create output pipes: %s";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 66c76993e26df79e7ca312b4623b8922798f3e52..5682ba2e0837c9b528d082cb5b5c25d7b95c2c89 100644 (file)
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"

diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index a32a93b8ebe7fe1f46462b26ac1b4a4377d88b13..096ad186046960f95e873bd04193562aae55e20e 100644 (file)
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"

diff --git a/locale/cups_de.po b/locale/cups_de.po
index 378b406e106ffa8bfd308e19fe7b8b8b5169e271..e344f03b9d0e2cf636f0c893c33a65e45c0559d1 100644 (file)
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2016-09-17 18:45+0200\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/locale/cups_es.po b/locale/cups_es.po
index e99177659efd503efd6afabbae0ee74f3cb7c78f..26e71b1d90af22860c75bf4dde8c80dfb11dbf14 100644 (file)
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index fd4a9e3a73e9ef74001d791689b2ecbd1cf89c06..2deff009bf6c9d9d12613ed6bdaed7d93ce9478d 100644 (file)
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/locale/cups_it.po b/locale/cups_it.po
index ea17c547c5668010673e5a0855e62996bc8e3681..1963f7f3766ab54a3f13f7150f72cad0c7b48c0e 100644 (file)
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 97efa9265a6cf95948846f2740121d0dbd4f593f..1df25d361635015c8911e2424700208672523476 100644 (file)
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"

diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index da42564c62b00b7dee2621b2d1ee970fde135e6b..04e5f80c99a04ed5515f53b5d25cb7c8e5df59a1 100644 (file)
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 68568e3b8f492681e1a78440082e6182986672db..66a6eafd16d208ef082f720e66a9e485c753b6d6 100644 (file)
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-03-11 10:02-0500\n"
+"POT-Creation-Date: 2017-04-05 15:24-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"

diff --git a/locale/po2strings.c b/locale/po2strings.c
index 4638275b8ed6e23ad476d89936a3231cb0291248..d67405710212f563c641c3b8e4b2f46303af485a 100644 (file)
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -360,6 +360,34 @@ normalize_string(const char *idstr,        /* I - msgid string */
 
       idstr ++;
     }
+    else if (*idstr == '\'')
+    {
+      if (strchr(idstr + 1, '\'') == NULL || quote)
+      {
+       /*
+        * Convert second ' (or ' used for a contraction) to Unicode right
+        * (curley) single quote.
+        */
+
+       *bufptr++ = (char)0xE2;
+       *bufptr++ = (char)0x80;
+       *bufptr++ = (char)0x99;
+       quote     = 0;
+      }
+      else
+      {
+       /*
+        * Convert first ' to Unicode left (curley) single quote.
+        */
+
+       *bufptr++ = (char)0xE2;
+       *bufptr++ = (char)0x80;
+       *bufptr++ = (char)0x98;
+       quote     = 1;
+      }
+
+      idstr ++;
+    }
     else
       *bufptr++ = *idstr;