From a740a8491bb7fd37dd8cc8b7f7c18cb11431541e Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Fri, 10 Mar 2017 13:52:48 -0500 Subject: [PATCH] The IPP Everywhere finishings support did not work correctly with common UI or command-line options (Issue #4976) Split finishing options into "standard" groups so that simple "pick one" UI can be used. --- CHANGES.txt | 4 +- cups/ppd-cache.c | 220 ++++++++++----- locale/cups.pot | 636 +++++++++++++++++++++---------------------- locale/cups.strings | 4 +- locale/cups_ca.po | 14 +- locale/cups_cs.po | 14 +- locale/cups_de.po | 20 +- locale/cups_es.po | 20 +- locale/cups_fr.po | 14 +- locale/cups_it.po | 14 +- locale/cups_ja.po | 14 +- locale/cups_pt_BR.po | 14 +- locale/cups_ru.po | 14 +- 13 files changed, 553 insertions(+), 449 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e774dfb07..e8ccbed77 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.2.3 - 2017-03-09 +CHANGES.txt - 2.2.3 - 2017-03-10 -------------------------------- CHANGES IN CUPS V2.2.3 @@ -17,6 +17,8 @@ CHANGES IN CUPS V2.2.3 supported by the printer (Issue #4953) - The IPP Everywhere PPD generator did not return useful error messages (Issue #4954) + - The IPP Everywhere finishings support did not work correctly with + common UI or command-line options (Issue #4976) - The default cupsd.conf file did not work on systems compiled without Kerberos support (Issue #4947) - Fixed some localization issues on macOS () diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index bfa2ded15..6bd80b8f2 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -50,21 +50,20 @@ static void pwg_unppdize_name(const char *ppd, char *name, size_t namesize, * attributes and values and adds them to the specified IPP request. */ -int /* O - New number of copies */ -_cupsConvertOptions(ipp_t *request, /* I - IPP request */ - ppd_file_t *ppd, /* I - PPD file */ - _ppd_cache_t *pc, /* I - PPD cache info */ - ipp_attribute_t *media_col_sup, - /* I - media-col-supported values */ - ipp_attribute_t *doc_handling_sup, - /* I - multiple-document-handling-supported values */ - ipp_attribute_t *print_color_mode_sup, - /* I - Printer supports print-color-mode */ - const char *user, /* I - User info */ - const char *format, /* I - document-format value */ - int copies, /* I - Number of copies */ - int num_options, /* I - Number of options */ - cups_option_t *options) /* I - Options */ +int /* O - New number of copies */ +_cupsConvertOptions( + ipp_t *request, /* I - IPP request */ + ppd_file_t *ppd, /* I - PPD file */ + _ppd_cache_t *pc, /* I - PPD cache info */ + ipp_attribute_t *media_col_sup, /* I - media-col-supported values */ + ipp_attribute_t *doc_handling_sup, /* I - multiple-document-handling-supported values */ + ipp_attribute_t *print_color_mode_sup, + /* I - Printer supports print-color-mode */ + const char *user, /* I - User info */ + const char *format, /* I - document-format value */ + int copies, /* I - Number of copies */ + int num_options, /* I - Number of options */ + cups_option_t *options) /* I - Options */ { int i; /* Looping var */ const char *keyword, /* PWG keyword */ @@ -3898,88 +3897,179 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */ /* * Finishing options... + * + * Eventually need to re-add support for finishings-col-database, however + * it is difficult to map arbitrary finishing-template values to PPD options + * and have the right constraints apply (e.g. stapling vs. folding vs. + * punching, etc.) */ - if ((attr = ippFindAttribute(response, "finishings-col-database", IPP_TAG_BEGIN_COLLECTION)) != NULL) + if ((attr = ippFindAttribute(response, "finishings-supported", IPP_TAG_ENUM)) != NULL) { - ipp_t *col; /* Collection value */ - ipp_attribute_t *template; /* "finishing-template" member */ const char *name; /* String name */ - int value; /* Enum value, if any */ + int value; /* Enum value */ cups_array_t *names; /* Names we've added */ count = ippGetCount(attr); names = cupsArrayNew3((cups_array_func_t)strcmp, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - cupsFilePrintf(fp, "*OpenUI *cupsFinishingTemplate/%s: PickMany\n" - "*OrderDependency: 10 AnySetup *cupsFinishingTemplate\n" - "*DefaultcupsFinishingTemplate: none\n" - "*cupsFinishingTemplate none/%s: \"\"\n" - "*cupsIPPFinishings 3/none: \"*cupsFinishingTemplate none\"\n", _cupsLangString(lang, _("Finishing")), _cupsLangString(lang, _("No Finishing"))); + /* + * Staple/Bind/Stitch + */ for (i = 0; i < count; i ++) { - col = ippGetCollection(attr, i); - template = ippFindAttribute(col, "finishing-template", IPP_TAG_ZERO); - - if ((name = ippGetString(template, 0, NULL)) == NULL || !strcmp(name, "none")) - continue; + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); - if (cupsArrayFind(names, (char *)name)) - continue; /* Already did this finishing template */ + if (!strncmp(name, "staple-", 7) || !strncmp(name, "bind-", 5) || !strncmp(name, "edge-stitch-", 12) || !strcmp(name, "saddle-stitch")) + break; + } - cupsArrayAdd(names, (char *)name); + if (i < count) + { + cupsFilePrintf(fp, "*OpenUI *StapleLocation/%s: PickOne\n", _cupsLangString(lang, _("Staple"))); + cupsFilePuts(fp, "*OrderDependency: 10 AnySetup *StapleLocation\n"); + cupsFilePuts(fp, "*DefaultStapleLocation: None\n"); + cupsFilePrintf(fp, "*StapleLocation None/%s: \"\"\n", _cupsLangString(lang, _("None"))); - for (j = 0; j < (int)(sizeof(finishings) / sizeof(finishings[0])); j ++) + for (; i < count; i ++) { - if (!strcmp(finishings[j][0], name)) - { - cupsFilePrintf(fp, "*cupsFinishingTemplate %s/%s: \"\"\n", name, _cupsLangString(lang, finishings[j][1])); + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); - value = ippEnumValue("finishings", name); + if (strncmp(name, "staple-", 7) && strncmp(name, "bind-", 5) && strncmp(name, "edge-stitch-", 12) && strcmp(name, "saddle-stitch")) + continue; - if (value) - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*cupsFinishingTemplate %s\"\n", value, name, name); - break; - } + if (cupsArrayFind(names, (char *)name)) + continue; /* Already did this finishing template */ + + cupsArrayAdd(names, (char *)name); + + for (j = 0; j < (int)(sizeof(finishings) / sizeof(finishings[0])); j ++) + { + if (!strcmp(finishings[j][0], name)) + { + cupsFilePrintf(fp, "*StapleLocation %s/%s: \"\"\n", name, _cupsLangString(lang, finishings[j][1])); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*StapleLocation %s\"\n", value, name, name); + break; + } + } } + + cupsFilePuts(fp, "*CloseUI: *StapleLocation\n"); } - cupsArrayDelete(names); + /* + * Fold + */ - cupsFilePuts(fp, "*CloseUI: *cupsFinishingTemplate\n"); - } - else if ((attr = ippFindAttribute(response, "finishings-supported", IPP_TAG_ENUM)) != NULL && (count = ippGetCount(attr)) > 1 ) - { - const char *name; /* String name */ - int value; /* Enum value, if any */ + for (i = 0; i < count; i ++) + { + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); - count = ippGetCount(attr); + if (!strncmp(name, "fold-", 5)) + break; + } + + if (i < count) + { + cupsFilePrintf(fp, "*OpenUI *FoldType/%s: PickOne\n", _cupsLangString(lang, _("Fold"))); + cupsFilePuts(fp, "*OrderDependency: 10 AnySetup *FoldType\n"); + cupsFilePuts(fp, "*DefaultFoldType: None\n"); + cupsFilePrintf(fp, "*FoldType None/%s: \"\"\n", _cupsLangString(lang, _("None"))); + + for (; i < count; i ++) + { + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); + + if (strncmp(name, "fold-", 5)) + continue; - cupsFilePrintf(fp, "*OpenUI *cupsFinishingTemplate/%s: PickMany\n" - "*OrderDependency: 10 AnySetup *cupsFinishingTemplate\n" - "*DefaultcupsFinishingTemplate: none\n" - "*cupsFinishingTemplate none/%s: \"\"\n" - "*cupsIPPFinishings 3/none: \"*cupsFinishingTemplate none\"\n", _cupsLangString(lang, _("Finishing")), _cupsLangString(lang, _("No Finishing"))); + if (cupsArrayFind(names, (char *)name)) + continue; /* Already did this finishing template */ + + cupsArrayAdd(names, (char *)name); + + for (j = 0; j < (int)(sizeof(finishings) / sizeof(finishings[0])); j ++) + { + if (!strcmp(finishings[j][0], name)) + { + cupsFilePrintf(fp, "*FoldType %s/%s: \"\"\n", name, _cupsLangString(lang, finishings[j][1])); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*FoldType %s\"\n", value, name, name); + break; + } + } + } + + cupsFilePuts(fp, "*CloseUI: *FoldType\n"); + } + + /* + * Punch + */ for (i = 0; i < count; i ++) { - if ((value = ippGetInteger(attr, i)) == 3) - continue; + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); + + if (!strncmp(name, "punch-", 6)) + break; + } + + if (i < count) + { + cupsFilePrintf(fp, "*OpenUI *PunchMedia/%s: PickOne\n", _cupsLangString(lang, _("Punch"))); + cupsFilePuts(fp, "*OrderDependency: 10 AnySetup *PunchMedia\n"); + cupsFilePuts(fp, "*DefaultPunchMedia: None\n"); + cupsFilePrintf(fp, "*PunchMedia None/%s: \"\"\n", _cupsLangString(lang, _("None"))); - name = ippEnumString("finishings", value); - for (j = 0; j < (int)(sizeof(finishings) / sizeof(finishings[0])); j ++) + for (i = 0; i < count; i ++) { - if (!strcmp(finishings[j][0], name)) - { - cupsFilePrintf(fp, "*cupsFinishingTemplate %s/%s: \"\"\n", name, _cupsLangString(lang, finishings[j][1])); - cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*cupsFinishingTemplate %s\"\n", value, name, name); - break; - } + value = ippGetInteger(attr, i); + name = ippEnumString("finishings", value); + + if (strncmp(name, "punch-", 6)) + continue; + + if (cupsArrayFind(names, (char *)name)) + continue; /* Already did this finishing template */ + + cupsArrayAdd(names, (char *)name); + + for (j = 0; j < (int)(sizeof(finishings) / sizeof(finishings[0])); j ++) + { + if (!strcmp(finishings[j][0], name)) + { + cupsFilePrintf(fp, "*PunchMedia %s/%s: \"\"\n", name, _cupsLangString(lang, finishings[j][1])); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*PunchMedia %s\"\n", value, name, name); + break; + } + } } + + cupsFilePuts(fp, "*CloseUI: *PunchMedia\n"); + } + + /* + * Booklet + */ + + if (ippContainsInteger(attr, IPP_FINISHINGS_BOOKLET_MAKER)) + { + cupsFilePrintf(fp, "*OpenUI *Booklet/%s: Boolean\n", _cupsLangString(lang, _("Booklet"))); + cupsFilePuts(fp, "*OrderDependency: 10 AnySetup *Booklet\n"); + cupsFilePuts(fp, "*DefaultBooklet: False\n"); + cupsFilePuts(fp, "*Booklet False: \"\"\n"); + cupsFilePuts(fp, "*Booklet True: \"\"\n"); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/booklet-maker: \"*Booklet True\"\n", IPP_FINISHINGS_BOOKLET_MAKER); + cupsFilePuts(fp, "*CloseUI: *Booklet\n"); } - cupsFilePuts(fp, "*CloseUI: *cupsFinishingTemplate\n"); + cupsArrayDelete(names); } /* diff --git a/locale/cups.pot b/locale/cups.pot index 1d57face4..7efd89e1d 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2530,23 +2530,23 @@ msgstr "" msgid "2 inches/sec." msgstr "" -#: cups/ppd-cache.c:3109 +#: cups/ppd-cache.c:3108 msgid "2-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3110 +#: cups/ppd-cache.c:3109 msgid "2-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3108 +#: cups/ppd-cache.c:3107 msgid "2-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3107 +#: cups/ppd-cache.c:3106 msgid "2-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3779 ppdc/sample.c:262 +#: cups/ppd-cache.c:3778 ppdc/sample.c:262 msgid "2-Sided Printing" msgstr "" @@ -2698,19 +2698,19 @@ msgstr "" msgid "3 x 5" msgstr "" -#: cups/ppd-cache.c:3120 +#: cups/ppd-cache.c:3119 msgid "3-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3118 +#: cups/ppd-cache.c:3117 msgid "3-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3117 +#: cups/ppd-cache.c:3116 msgid "3-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3119 +#: cups/ppd-cache.c:3118 msgid "3-Hole Punch (Reverse Portrait)" msgstr "" @@ -2802,19 +2802,19 @@ msgstr "" msgid "4 inches/sec." msgstr "" -#: cups/ppd-cache.c:3114 +#: cups/ppd-cache.c:3113 msgid "4-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3112 +#: cups/ppd-cache.c:3111 msgid "4-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3111 +#: cups/ppd-cache.c:3110 msgid "4-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3113 +#: cups/ppd-cache.c:3112 msgid "4-Hole Punch (Reverse Portrait)" msgstr "" @@ -3212,7 +3212,7 @@ msgstr "" msgid "Accepted" msgstr "" -#: cups/ppd-cache.c:3090 +#: cups/ppd-cache.c:3089 msgid "Accordian Fold" msgstr "" @@ -3237,19 +3237,19 @@ msgstr "" msgid "Administration" msgstr "" -#: cups/ppd-cache.c:3540 +#: cups/ppd-cache.c:3539 msgid "Advanced Photo Paper" msgstr "" -#: cups/ppd-cache.c:3454 +#: cups/ppd-cache.c:3453 msgid "Alternate" msgstr "" -#: cups/ppd-cache.c:3462 +#: cups/ppd-cache.c:3461 msgid "Alternate Roll" msgstr "" -#: cups/ppd-cache.c:3534 +#: cups/ppd-cache.c:3533 msgid "Aluminum" msgstr "" @@ -3265,19 +3265,19 @@ msgstr "" msgid "Applicator" msgstr "" -#: cups/ppd-cache.c:3568 +#: cups/ppd-cache.c:3567 msgid "Archival Envelope" msgstr "" -#: cups/ppd-cache.c:3580 +#: cups/ppd-cache.c:3579 msgid "Archival Fabric" msgstr "" -#: cups/ppd-cache.c:3657 +#: cups/ppd-cache.c:3656 msgid "Archival Paper" msgstr "" -#: cups/ppd-cache.c:3629 +#: cups/ppd-cache.c:3628 msgid "Archival Photo Paper" msgstr "" @@ -3301,7 +3301,7 @@ msgstr "" msgid "Attribute groups are out of order (%x < %x)." msgstr "" -#: cups/ppd-cache.c:3452 cups/ppd-cache.c:3535 cups/ppd-cache.c:3839 +#: cups/ppd-cache.c:3451 cups/ppd-cache.c:3534 cups/ppd-cache.c:3838 msgid "Automatic" msgstr "" @@ -3353,7 +3353,7 @@ msgstr "" msgid "B9" msgstr "" -#: cups/ppd-cache.c:3536 +#: cups/ppd-cache.c:3535 msgid "Back Print Film" msgstr "" @@ -3378,16 +3378,16 @@ msgstr "" msgid "Bad OrderDependency" msgstr "" -#: cups/ppd-cache.c:458 cups/ppd-cache.c:505 cups/ppd-cache.c:590 -#: cups/ppd-cache.c:596 cups/ppd-cache.c:612 cups/ppd-cache.c:628 -#: cups/ppd-cache.c:637 cups/ppd-cache.c:645 cups/ppd-cache.c:662 -#: cups/ppd-cache.c:670 cups/ppd-cache.c:685 cups/ppd-cache.c:693 -#: cups/ppd-cache.c:714 cups/ppd-cache.c:726 cups/ppd-cache.c:741 -#: cups/ppd-cache.c:753 cups/ppd-cache.c:775 cups/ppd-cache.c:783 -#: cups/ppd-cache.c:801 cups/ppd-cache.c:809 cups/ppd-cache.c:824 -#: cups/ppd-cache.c:832 cups/ppd-cache.c:850 cups/ppd-cache.c:858 -#: cups/ppd-cache.c:885 cups/ppd-cache.c:955 cups/ppd-cache.c:963 -#: cups/ppd-cache.c:971 +#: 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 msgid "Bad PPD cache file." msgstr "" @@ -3559,7 +3559,7 @@ msgstr "" msgid "Bad/empty URI" msgstr "" -#: cups/ppd-cache.c:3075 +#: cups/ppd-cache.c:3074 msgid "Bale" msgstr "" @@ -3567,27 +3567,27 @@ msgstr "" msgid "Banners" msgstr "" -#: cups/ppd-cache.c:3076 +#: cups/ppd-cache.c:3075 msgid "Bind" msgstr "" -#: cups/ppd-cache.c:3080 +#: cups/ppd-cache.c:3079 msgid "Bind (Landscape)" msgstr "" -#: cups/ppd-cache.c:3078 +#: cups/ppd-cache.c:3077 msgid "Bind (Portrait)" msgstr "" -#: cups/ppd-cache.c:3077 +#: cups/ppd-cache.c:3076 msgid "Bind (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3079 +#: cups/ppd-cache.c:3078 msgid "Bind (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3569 +#: cups/ppd-cache.c:3568 msgid "Bond Envelope" msgstr "" @@ -3595,7 +3595,11 @@ msgstr "" msgid "Bond Paper" msgstr "" -#: cups/ppd-cache.c:3081 +#: cups/ppd-cache.c:4063 +msgid "Booklet" +msgstr "" + +#: cups/ppd-cache.c:3080 msgid "Booklet Maker" msgstr "" @@ -3604,11 +3608,11 @@ msgstr "" msgid "Boolean expected for waiteof option \"%s\"." msgstr "" -#: cups/ppd-cache.c:3465 +#: cups/ppd-cache.c:3464 msgid "Bottom" msgstr "" -#: cups/ppd-cache.c:3840 +#: cups/ppd-cache.c:3839 msgid "Bottom Tray" msgstr "" @@ -3616,7 +3620,7 @@ msgstr "" msgid "Buffer overflow detected, aborting." msgstr "" -#: cups/ppd-cache.c:3539 +#: cups/ppd-cache.c:3538 msgid "CD" msgstr "" @@ -3648,11 +3652,11 @@ msgstr "" msgid "Cannot share a remote Kerberized printer." msgstr "" -#: cups/ppd-cache.c:3537 +#: cups/ppd-cache.c:3536 msgid "Cardboard" msgstr "" -#: cups/ppd-cache.c:3538 +#: cups/ppd-cache.c:3537 msgid "Cardstock" msgstr "" @@ -3660,11 +3664,11 @@ msgstr "" msgid "Cassette" msgstr "" -#: cups/ppd-cache.c:3469 +#: cups/ppd-cache.c:3468 msgid "Center" msgstr "" -#: cups/ppd-cache.c:3841 +#: cups/ppd-cache.c:3840 msgid "Center Tray" msgstr "" @@ -3690,28 +3694,28 @@ msgstr "" msgid "Close-Job doesn't support the job-uri attribute." msgstr "" -#: cups/ppd-cache.c:3082 +#: cups/ppd-cache.c:3081 msgid "Coat" msgstr "" -#: cups/ppd-cache.c:3570 +#: cups/ppd-cache.c:3569 msgid "Coated Envelope" msgstr "" -#: cups/ppd-cache.c:3658 +#: cups/ppd-cache.c:3657 msgid "Coated Paper" msgstr "" -#: cups/ppd-cache.c:3743 ppdc/sample.c:276 +#: cups/ppd-cache.c:3742 ppdc/sample.c:276 msgid "Color" msgstr "" -#: cups/ppd-cache.c:3719 cups/ppd-cache.c:3730 cups/ppd-cache.c:3741 -#: cups/ppd-cache.c:3751 ppdc/sample.c:274 +#: cups/ppd-cache.c:3718 cups/ppd-cache.c:3729 cups/ppd-cache.c:3740 +#: cups/ppd-cache.c:3750 ppdc/sample.c:274 msgid "Color Mode" msgstr "" -#: cups/ppd-cache.c:3605 +#: cups/ppd-cache.c:3604 msgid "Colored Labels" msgstr "" @@ -3738,15 +3742,15 @@ msgstr "" msgid "Continue" msgstr "" -#: cups/ppd-cache.c:3553 ppdc/sample.c:360 +#: cups/ppd-cache.c:3552 ppdc/sample.c:360 msgid "Continuous" msgstr "" -#: cups/ppd-cache.c:3554 +#: cups/ppd-cache.c:3553 msgid "Continuous Long" msgstr "" -#: cups/ppd-cache.c:3555 +#: cups/ppd-cache.c:3554 msgid "Continuous Short" msgstr "" @@ -3758,15 +3762,15 @@ msgstr "" msgid "Copying print data." msgstr "" -#: cups/ppd-cache.c:3571 +#: cups/ppd-cache.c:3570 msgid "Cotton Envelope" msgstr "" -#: cups/ppd-cache.c:3659 +#: cups/ppd-cache.c:3658 msgid "Cotton Paper" msgstr "" -#: cups/ppd-cache.c:3083 +#: cups/ppd-cache.c:3082 msgid "Cover" msgstr "" @@ -3798,7 +3802,7 @@ msgstr "" msgid "Cut" msgstr "" -#: cups/ppd-cache.c:3139 +#: cups/ppd-cache.c:3138 msgid "Cut Media" msgstr "" @@ -3806,7 +3810,7 @@ msgstr "" msgid "Cutter" msgstr "" -#: cups/ppd-cache.c:3564 +#: cups/ppd-cache.c:3563 msgid "DVD" msgstr "" @@ -3822,7 +3826,7 @@ msgstr "" msgid "Data file sent successfully." msgstr "" -#: cups/ppd-cache.c:3753 +#: cups/ppd-cache.c:3752 msgid "Deep Color" msgstr "" @@ -3887,7 +3891,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: cups/ppd-cache.c:3458 +#: cups/ppd-cache.c:3457 msgid "Disc" msgstr "" @@ -3896,36 +3900,36 @@ msgstr "" msgid "Document #%d does not exist in job #%d." msgstr "" -#: cups/ppd-cache.c:3091 +#: cups/ppd-cache.c:3090 msgid "Double Gate Fold" msgstr "" -#: cups/ppd-cache.c:3132 +#: cups/ppd-cache.c:3131 msgid "Double Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3130 +#: cups/ppd-cache.c:3129 msgid "Double Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3129 +#: cups/ppd-cache.c:3128 msgid "Double Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3131 +#: cups/ppd-cache.c:3130 msgid "Double Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3562 +#: cups/ppd-cache.c:3561 msgid "Double Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:4004 cups/ppd-cache.c:4059 cups/ppd-cache.c:4061 -#: cups/ppd-cache.c:4088 +#: cups/ppd-cache.c:4094 cups/ppd-cache.c:4149 cups/ppd-cache.c:4151 +#: cups/ppd-cache.c:4178 msgid "Draft" msgstr "" -#: cups/ppd-cache.c:3563 +#: cups/ppd-cache.c:3562 msgid "Dry Film" msgstr "" @@ -3951,7 +3955,7 @@ msgstr "" msgid "Edit Configuration File" msgstr "" -#: cups/ppd-cache.c:3565 +#: cups/ppd-cache.c:3564 msgid "Embossing Foil" msgstr "" @@ -3963,7 +3967,7 @@ msgstr "" msgid "Encryption is not supported." msgstr "" -#: cups/ppd-cache.c:3566 +#: cups/ppd-cache.c:3565 msgid "End Board" msgstr "" @@ -3972,7 +3976,7 @@ msgstr "" msgid "Ending Banner" msgstr "" -#: cups/ppd-cache.c:3092 +#: cups/ppd-cache.c:3091 msgid "Engineering Z Fold" msgstr "" @@ -3984,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:3457 cups/ppd-cache.c:3567 +#: cups/ppd-cache.c:3456 cups/ppd-cache.c:3566 msgid "Envelope" msgstr "" @@ -4265,11 +4269,11 @@ msgstr "" msgid "Every Label" msgstr "" -#: cups/ppd-cache.c:3545 +#: cups/ppd-cache.c:3544 msgid "Everyday Glossy Photo Paper" msgstr "" -#: cups/ppd-cache.c:3546 +#: cups/ppd-cache.c:3545 msgid "Everyday Matte Paper" msgstr "" @@ -4289,7 +4293,7 @@ msgstr "" msgid "Expressions:" msgstr "" -#: cups/ppd-cache.c:3547 +#: cups/ppd-cache.c:3546 msgid "Extra Heavyweight Paper" msgstr "" @@ -4303,15 +4307,15 @@ msgstr "" msgid "FAIL" msgstr "" -#: cups/ppd-cache.c:3579 +#: cups/ppd-cache.c:3578 msgid "Fabric" msgstr "" -#: cups/ppd-cache.c:3842 +#: cups/ppd-cache.c:3841 msgid "Face Down" msgstr "" -#: cups/ppd-cache.c:3843 +#: cups/ppd-cache.c:3842 msgid "Face Up" msgstr "" @@ -4327,7 +4331,7 @@ msgstr "" msgid "Fanfold US" msgstr "" -#: cups/ppd-cache.c:3721 +#: cups/ppd-cache.c:3720 msgid "Fast Grayscale" msgstr "" @@ -4365,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:3586 +#: cups/ppd-cache.c:3585 msgid "Film" msgstr "" -#: cups/ppd-cache.c:3572 +#: cups/ppd-cache.c:3571 msgid "Fine Envelope" msgstr "" @@ -4379,27 +4383,23 @@ msgstr "" msgid "Finished page %d." msgstr "" -#: cups/ppd-cache.c:3918 cups/ppd-cache.c:3963 -msgid "Finishing" -msgstr "" - -#: cups/ppd-cache.c:3587 +#: cups/ppd-cache.c:3586 msgid "Flexo Base" msgstr "" -#: cups/ppd-cache.c:3588 +#: cups/ppd-cache.c:3587 msgid "Flexo Photo Polymer" msgstr "" -#: cups/ppd-cache.c:3589 +#: cups/ppd-cache.c:3588 msgid "Flute" msgstr "" -#: cups/ppd-cache.c:3590 +#: cups/ppd-cache.c:3589 msgid "Foil" msgstr "" -#: cups/ppd-cache.c:3089 +#: cups/ppd-cache.c:3088 cups/ppd-cache.c:3978 msgid "Fold" msgstr "" @@ -4411,11 +4411,11 @@ msgstr "" msgid "Forbidden" msgstr "" -#: cups/ppd-cache.c:3591 +#: cups/ppd-cache.c:3590 msgid "Full Cut Tabs" msgstr "" -#: cups/ppd-cache.c:3093 +#: cups/ppd-cache.c:3092 msgid "Gate Fold" msgstr "" @@ -4431,39 +4431,39 @@ msgstr "" msgid "Get-Response-PDU uses indefinite length" msgstr "" -#: cups/ppd-cache.c:3592 +#: cups/ppd-cache.c:3591 msgid "Glass" msgstr "" -#: cups/ppd-cache.c:3593 +#: cups/ppd-cache.c:3592 msgid "Glass Colored" msgstr "" -#: cups/ppd-cache.c:3594 +#: cups/ppd-cache.c:3593 msgid "Glass Opaque" msgstr "" -#: cups/ppd-cache.c:3595 +#: cups/ppd-cache.c:3594 msgid "Glass Surfaced" msgstr "" -#: cups/ppd-cache.c:3596 +#: cups/ppd-cache.c:3595 msgid "Glass Textured" msgstr "" -#: cups/ppd-cache.c:3541 +#: cups/ppd-cache.c:3540 msgid "Glossy Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3581 +#: cups/ppd-cache.c:3580 msgid "Glossy Fabric" msgstr "" -#: cups/ppd-cache.c:3606 +#: cups/ppd-cache.c:3605 msgid "Glossy Labels" msgstr "" -#: cups/ppd-cache.c:3557 +#: cups/ppd-cache.c:3556 msgid "Glossy Optical Disc" msgstr "" @@ -4471,7 +4471,7 @@ msgstr "" msgid "Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3631 +#: cups/ppd-cache.c:3630 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:3597 +#: cups/ppd-cache.c:3596 msgid "Gravure Cylinder" msgstr "" -#: cups/ppd-cache.c:3732 ppdc/sample.c:275 +#: cups/ppd-cache.c:3731 ppdc/sample.c:275 msgid "Grayscale" msgstr "" @@ -4494,15 +4494,15 @@ msgstr "" msgid "HP" msgstr "" -#: cups/ppd-cache.c:3460 +#: cups/ppd-cache.c:3459 msgid "Hagaki" msgstr "" -#: cups/ppd-cache.c:3094 +#: cups/ppd-cache.c:3093 msgid "Half Fold" msgstr "" -#: cups/ppd-cache.c:3095 +#: cups/ppd-cache.c:3094 msgid "Half Z Fold" msgstr "" @@ -4514,15 +4514,15 @@ msgstr "" msgid "Hash buffer too small." msgstr "" -#: cups/ppd-cache.c:3662 +#: cups/ppd-cache.c:3661 msgid "Heavyweight Coated Paper" msgstr "" -#: cups/ppd-cache.c:3573 +#: cups/ppd-cache.c:3572 msgid "Heavyweight Envelope" msgstr "" -#: cups/ppd-cache.c:3661 +#: cups/ppd-cache.c:3660 msgid "Heavyweight Paper" msgstr "" @@ -4530,23 +4530,23 @@ msgstr "" msgid "Help file not in index." msgstr "" -#: cups/ppd-cache.c:4014 cups/ppd-cache.c:4064 cups/ppd-cache.c:4091 +#: cups/ppd-cache.c:4104 cups/ppd-cache.c:4154 cups/ppd-cache.c:4181 msgid "High" msgstr "" -#: cups/ppd-cache.c:3582 +#: cups/ppd-cache.c:3581 msgid "High Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3607 +#: cups/ppd-cache.c:3606 msgid "High Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3558 +#: cups/ppd-cache.c:3557 msgid "High Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3632 +#: cups/ppd-cache.c:3631 msgid "High Gloss Photo Paper" msgstr "" @@ -4666,23 +4666,23 @@ msgstr "" msgid "Illegal whitespace character" msgstr "" -#: cups/ppd-cache.c:3598 +#: cups/ppd-cache.c:3597 msgid "Image Setter Paper" msgstr "" -#: cups/ppd-cache.c:3599 +#: cups/ppd-cache.c:3598 msgid "Imaging Cylinder" msgstr "" -#: cups/ppd-cache.c:3574 +#: cups/ppd-cache.c:3573 msgid "Inkjet Envelope" msgstr "" -#: cups/ppd-cache.c:3608 +#: cups/ppd-cache.c:3607 msgid "Inkjet Labels" msgstr "" -#: cups/ppd-cache.c:3663 +#: cups/ppd-cache.c:3662 msgid "Inkjet Paper" msgstr "" @@ -4885,7 +4885,7 @@ msgstr "" msgid "Jobs" msgstr "" -#: cups/ppd-cache.c:3102 +#: cups/ppd-cache.c:3101 msgid "Jog" msgstr "" @@ -4901,15 +4901,15 @@ msgstr "" msgid "Label Top" msgstr "" -#: cups/ppd-cache.c:3604 +#: cups/ppd-cache.c:3603 msgid "Labels" msgstr "" -#: cups/ppd-cache.c:3103 +#: cups/ppd-cache.c:3102 msgid "Laminate" msgstr "" -#: cups/ppd-cache.c:3614 +#: cups/ppd-cache.c:3613 msgid "Laminating Foil" msgstr "" @@ -4922,11 +4922,11 @@ msgstr "" msgid "Large Address" msgstr "" -#: cups/ppd-cache.c:3455 +#: cups/ppd-cache.c:3454 msgid "Large Capacity" msgstr "" -#: cups/ppd-cache.c:3844 +#: cups/ppd-cache.c:3843 msgid "Large Capacity Tray" msgstr "" @@ -4934,19 +4934,19 @@ msgstr "" msgid "LaserJet Series PCL 4/5" msgstr "" -#: cups/ppd-cache.c:3467 +#: cups/ppd-cache.c:3466 msgid "Left" msgstr "" -#: cups/ppd-cache.c:3096 +#: cups/ppd-cache.c:3095 msgid "Left Gate Fold" msgstr "" -#: cups/ppd-cache.c:3845 +#: cups/ppd-cache.c:3844 msgid "Left Tray" msgstr "" -#: cups/ppd-cache.c:3097 +#: cups/ppd-cache.c:3096 msgid "Letter Fold" msgstr "" @@ -4958,7 +4958,7 @@ msgstr "" msgid "Letter Oversize Long Edge" msgstr "" -#: cups/ppd-cache.c:3615 cups/ppd-cache.c:3664 +#: cups/ppd-cache.c:3614 cups/ppd-cache.c:3663 msgid "Letterhead" msgstr "" @@ -4966,11 +4966,11 @@ msgstr "" msgid "Light" msgstr "" -#: cups/ppd-cache.c:3575 +#: cups/ppd-cache.c:3574 msgid "Lightweight Envelope" msgstr "" -#: cups/ppd-cache.c:3665 +#: cups/ppd-cache.c:3664 msgid "Lightweight Paper" msgstr "" @@ -4990,7 +4990,7 @@ msgstr "" msgid "Local printer created." msgstr "" -#: cups/ppd-cache.c:3779 ppdc/sample.c:264 +#: cups/ppd-cache.c:3778 ppdc/sample.c:264 msgid "Long-Edge (Portrait)" msgstr "" @@ -4998,55 +4998,55 @@ msgstr "" msgid "Looking for printer." msgstr "" -#: cups/ppd-cache.c:3846 +#: cups/ppd-cache.c:3845 msgid "Mailbox 1" msgstr "" -#: cups/ppd-cache.c:3855 +#: cups/ppd-cache.c:3854 msgid "Mailbox 10" msgstr "" -#: cups/ppd-cache.c:3847 +#: cups/ppd-cache.c:3846 msgid "Mailbox 2" msgstr "" -#: cups/ppd-cache.c:3848 +#: cups/ppd-cache.c:3847 msgid "Mailbox 3" msgstr "" -#: cups/ppd-cache.c:3849 +#: cups/ppd-cache.c:3848 msgid "Mailbox 4" msgstr "" -#: cups/ppd-cache.c:3850 +#: cups/ppd-cache.c:3849 msgid "Mailbox 5" msgstr "" -#: cups/ppd-cache.c:3851 +#: cups/ppd-cache.c:3850 msgid "Mailbox 6" msgstr "" -#: cups/ppd-cache.c:3852 +#: cups/ppd-cache.c:3851 msgid "Mailbox 7" msgstr "" -#: cups/ppd-cache.c:3853 +#: cups/ppd-cache.c:3852 msgid "Mailbox 8" msgstr "" -#: cups/ppd-cache.c:3854 +#: cups/ppd-cache.c:3853 msgid "Mailbox 9" msgstr "" -#: cups/ppd-cache.c:3453 +#: cups/ppd-cache.c:3452 msgid "Main" msgstr "" -#: cups/ppd-cache.c:3461 +#: cups/ppd-cache.c:3460 msgid "Main Roll" msgstr "" -#: cups/ppd-cache.c:3456 +#: cups/ppd-cache.c:3455 msgid "Manual" msgstr "" @@ -5054,27 +5054,27 @@ msgstr "" msgid "Manual Feed" msgstr "" -#: cups/ppd-cache.c:3542 +#: cups/ppd-cache.c:3541 msgid "Matte Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3543 +#: cups/ppd-cache.c:3542 msgid "Matte Cover Paper" msgstr "" -#: cups/ppd-cache.c:3583 +#: cups/ppd-cache.c:3582 msgid "Matte Fabric" msgstr "" -#: cups/ppd-cache.c:3609 +#: cups/ppd-cache.c:3608 msgid "Matte Labels" msgstr "" -#: cups/ppd-cache.c:3559 +#: cups/ppd-cache.c:3558 msgid "Matte Optical Disc" msgstr "" -#: cups/ppd-cache.c:3633 +#: cups/ppd-cache.c:3632 msgid "Matte Photo Paper" msgstr "" @@ -5102,35 +5102,35 @@ msgstr "" msgid "Memory allocation error" msgstr "" -#: cups/ppd-cache.c:3616 +#: cups/ppd-cache.c:3615 msgid "Metal" msgstr "" -#: cups/ppd-cache.c:3617 +#: cups/ppd-cache.c:3616 msgid "Metal Glossy" msgstr "" -#: cups/ppd-cache.c:3618 +#: cups/ppd-cache.c:3617 msgid "Metal High Gloss" msgstr "" -#: cups/ppd-cache.c:3619 +#: cups/ppd-cache.c:3618 msgid "Metal Matte" msgstr "" -#: cups/ppd-cache.c:3620 +#: cups/ppd-cache.c:3619 msgid "Metal Satin" msgstr "" -#: cups/ppd-cache.c:3621 +#: cups/ppd-cache.c:3620 msgid "Metal Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3549 +#: cups/ppd-cache.c:3548 msgid "Mid-Weight Paper" msgstr "" -#: cups/ppd-cache.c:3464 cups/ppd-cache.c:3856 +#: cups/ppd-cache.c:3463 cups/ppd-cache.c:3855 msgid "Middle" msgstr "" @@ -5240,7 +5240,7 @@ msgstr "" msgid "Modify Printer" msgstr "" -#: cups/ppd-cache.c:3622 +#: cups/ppd-cache.c:3621 msgid "Mounting Tape" msgstr "" @@ -5256,39 +5256,39 @@ msgstr "" msgid "Moved Permanently" msgstr "" -#: cups/ppd-cache.c:3623 +#: cups/ppd-cache.c:3622 msgid "Multi Layer" msgstr "" -#: cups/ppd-cache.c:3624 +#: cups/ppd-cache.c:3623 msgid "Multi Part Form" msgstr "" -#: cups/ppd-cache.c:3124 +#: cups/ppd-cache.c:3123 msgid "Multi-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3122 +#: cups/ppd-cache.c:3121 msgid "Multi-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3121 +#: cups/ppd-cache.c:3120 msgid "Multi-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3123 +#: cups/ppd-cache.c:3122 msgid "Multi-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3471 +#: cups/ppd-cache.c:3470 msgid "Multipurpose" msgstr "" -#: cups/ppd-cache.c:3548 +#: cups/ppd-cache.c:3547 msgid "Multipurpose Paper" msgstr "" -#: cups/ppd-cache.c:3857 +#: cups/ppd-cache.c:3856 msgid "My Mailbox" msgstr "" @@ -5324,11 +5324,7 @@ msgstr "" msgid "No Content" msgstr "" -#: cups/ppd-cache.c:3918 cups/ppd-cache.c:3963 -msgid "No Finishing" -msgstr "" - -#: cups/ppd-cache.c:3158 +#: cups/ppd-cache.c:3157 msgid "No IPP attributes." msgstr "" @@ -5470,7 +5466,11 @@ msgstr "" msgid "Non-continuous (Web sensing)" msgstr "" -#: cups/ppd-cache.c:4007 cups/ppd-cache.c:4062 cups/ppd-cache.c:4089 +#: cups/ppd-cache.c:3934 cups/ppd-cache.c:3981 cups/ppd-cache.c:4028 +msgid "None" +msgstr "" + +#: cups/ppd-cache.c:4097 cups/ppd-cache.c:4152 cups/ppd-cache.c:4179 #: ppdc/sample.c:238 msgid "Normal" msgstr "" @@ -5511,11 +5511,11 @@ msgstr "" msgid "OK" msgstr "" -#: cups/ppd-cache.c:3779 ppdc/sample.c:263 +#: cups/ppd-cache.c:3778 ppdc/sample.c:263 msgid "Off (1-Sided)" msgstr "" -#: cups/ppd-cache.c:3544 +#: cups/ppd-cache.c:3543 msgid "Office Recycled Paper" msgstr "" @@ -5548,7 +5548,7 @@ msgstr "" msgid "Operation Policy" msgstr "" -#: cups/ppd-cache.c:3556 +#: cups/ppd-cache.c:3555 msgid "Optical Disc" msgstr "" @@ -5569,15 +5569,15 @@ msgstr "" msgid "Options:" msgstr "" -#: cups/ppd-cache.c:3625 +#: cups/ppd-cache.c:3624 msgid "Other" msgstr "" -#: cups/ppd-cache.c:466 +#: cups/ppd-cache.c:465 msgid "Out of date PPD cache file." msgstr "" -#: cups/ppd-cache.c:1946 +#: cups/ppd-cache.c:1945 msgid "Out of memory." msgstr "" @@ -5637,7 +5637,7 @@ msgstr "" msgid "Packet does not start with SEQUENCE" msgstr "" -#: cups/ppd-cache.c:3626 +#: cups/ppd-cache.c:3625 msgid "Paper" msgstr "" @@ -5657,7 +5657,7 @@ msgstr "" msgid "Paper tray is missing." msgstr "" -#: cups/ppd-cache.c:3098 +#: cups/ppd-cache.c:3097 msgid "Parallel Fold" msgstr "" @@ -5691,15 +5691,15 @@ msgstr "" msgid "Peel-Off" msgstr "" -#: cups/ppd-cache.c:3610 +#: cups/ppd-cache.c:3609 msgid "Permanent Labels" msgstr "" -#: cups/ppd-cache.c:3459 ppdc/sample.c:160 +#: cups/ppd-cache.c:3458 ppdc/sample.c:160 msgid "Photo" msgstr "" -#: cups/ppd-cache.c:3630 +#: cups/ppd-cache.c:3629 msgid "Photo Film" msgstr "" @@ -5707,59 +5707,59 @@ msgstr "" msgid "Photo Labels" msgstr "" -#: cups/ppd-cache.c:3627 cups/ppd-cache.c:3628 +#: cups/ppd-cache.c:3626 cups/ppd-cache.c:3627 msgid "Photo Paper" msgstr "" -#: cups/ppd-cache.c:3600 cups/ppd-cache.c:3602 +#: cups/ppd-cache.c:3599 cups/ppd-cache.c:3601 msgid "Photo Paper Plus Glossy II" msgstr "" -#: cups/ppd-cache.c:3601 cups/ppd-cache.c:3603 +#: cups/ppd-cache.c:3600 cups/ppd-cache.c:3602 msgid "Photo Paper Pro Platinum" msgstr "" -#: cups/ppd-cache.c:3576 +#: cups/ppd-cache.c:3575 msgid "Plain Envelope" msgstr "" -#: cups/ppd-cache.c:3656 ppdc/sample.c:281 +#: cups/ppd-cache.c:3655 ppdc/sample.c:281 msgid "Plain Paper" msgstr "" -#: cups/ppd-cache.c:3636 +#: cups/ppd-cache.c:3635 msgid "Plastic" msgstr "" -#: cups/ppd-cache.c:3637 +#: cups/ppd-cache.c:3636 msgid "Plastic Archival" msgstr "" -#: cups/ppd-cache.c:3638 +#: cups/ppd-cache.c:3637 msgid "Plastic Colored" msgstr "" -#: cups/ppd-cache.c:3639 +#: cups/ppd-cache.c:3638 msgid "Plastic Glossy" msgstr "" -#: cups/ppd-cache.c:3640 +#: cups/ppd-cache.c:3639 msgid "Plastic High Gloss" msgstr "" -#: cups/ppd-cache.c:3641 +#: cups/ppd-cache.c:3640 msgid "Plastic Matte" msgstr "" -#: cups/ppd-cache.c:3642 +#: cups/ppd-cache.c:3641 msgid "Plastic Satin" msgstr "" -#: cups/ppd-cache.c:3643 +#: cups/ppd-cache.c:3642 msgid "Plastic Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3644 +#: cups/ppd-cache.c:3643 msgid "Plate" msgstr "" @@ -5767,7 +5767,7 @@ msgstr "" msgid "Policies" msgstr "" -#: cups/ppd-cache.c:3645 +#: cups/ppd-cache.c:3644 msgid "Polyester" msgstr "" @@ -5795,23 +5795,23 @@ msgstr "" msgid "Postcard Long Edge" msgstr "" -#: cups/ppd-cache.c:3099 +#: cups/ppd-cache.c:3098 msgid "Poster Fold" msgstr "" -#: cups/ppd-cache.c:3646 +#: cups/ppd-cache.c:3645 msgid "Pre Cut Tabs" msgstr "" -#: cups/ppd-cache.c:3550 +#: cups/ppd-cache.c:3549 msgid "Premium Inkjet Paper" msgstr "" -#: cups/ppd-cache.c:3551 +#: cups/ppd-cache.c:3550 msgid "Premium Photo Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3552 +#: cups/ppd-cache.c:3551 msgid "Premium Presentation Matte Paper" msgstr "" @@ -5819,11 +5819,11 @@ msgstr "" msgid "Preparing to print." msgstr "" -#: cups/ppd-cache.c:3577 +#: cups/ppd-cache.c:3576 msgid "Preprinted Envelope" msgstr "" -#: cups/ppd-cache.c:3666 +#: cups/ppd-cache.c:3665 msgid "Preprinted Paper" msgstr "" @@ -5839,7 +5839,7 @@ msgstr "" msgid "Print Mode" msgstr "" -#: cups/ppd-cache.c:4000 cups/ppd-cache.c:4057 cups/ppd-cache.c:4086 +#: cups/ppd-cache.c:4090 cups/ppd-cache.c:4147 cups/ppd-cache.c:4176 msgid "Print Quality" msgstr "" @@ -5920,7 +5920,7 @@ msgstr "" msgid "Printer cannot print with supplied options." msgstr "" -#: cups/ppd-cache.c:4113 +#: cups/ppd-cache.c:4203 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:3104 +#: cups/ppd-cache.c:3103 cups/ppd-cache.c:4025 msgid "Punch" msgstr "" -#: cups/ppd-cache.c:3667 +#: cups/ppd-cache.c:3666 msgid "Punched Paper" msgstr "" @@ -5958,11 +5958,11 @@ msgstr "" msgid "Rank Owner Job File(s) Total Size" msgstr "" -#: cups/ppd-cache.c:3470 +#: cups/ppd-cache.c:3469 msgid "Rear" msgstr "" -#: cups/ppd-cache.c:3858 +#: cups/ppd-cache.c:3857 msgid "Rear Tray" msgstr "" @@ -6008,59 +6008,59 @@ msgstr "" msgid "Rewind" msgstr "" -#: cups/ppd-cache.c:3468 +#: cups/ppd-cache.c:3467 msgid "Right" msgstr "" -#: cups/ppd-cache.c:3100 +#: cups/ppd-cache.c:3099 msgid "Right Gate Fold" msgstr "" -#: cups/ppd-cache.c:3859 +#: cups/ppd-cache.c:3858 msgid "Right Tray" msgstr "" -#: cups/ppd-cache.c:3647 +#: cups/ppd-cache.c:3646 msgid "Roll" msgstr "" -#: cups/ppd-cache.c:3492 +#: cups/ppd-cache.c:3491 msgid "Roll 1" msgstr "" -#: cups/ppd-cache.c:3501 +#: cups/ppd-cache.c:3500 msgid "Roll 10" msgstr "" -#: cups/ppd-cache.c:3493 +#: cups/ppd-cache.c:3492 msgid "Roll 2" msgstr "" -#: cups/ppd-cache.c:3494 +#: cups/ppd-cache.c:3493 msgid "Roll 3" msgstr "" -#: cups/ppd-cache.c:3495 +#: cups/ppd-cache.c:3494 msgid "Roll 4" msgstr "" -#: cups/ppd-cache.c:3496 +#: cups/ppd-cache.c:3495 msgid "Roll 5" msgstr "" -#: cups/ppd-cache.c:3497 +#: cups/ppd-cache.c:3496 msgid "Roll 6" msgstr "" -#: cups/ppd-cache.c:3498 +#: cups/ppd-cache.c:3497 msgid "Roll 7" msgstr "" -#: cups/ppd-cache.c:3499 +#: cups/ppd-cache.c:3498 msgid "Roll 8" msgstr "" -#: cups/ppd-cache.c:3500 +#: cups/ppd-cache.c:3499 msgid "Roll 9" msgstr "" @@ -6077,31 +6077,31 @@ msgstr "" msgid "SSL/TLS Negotiation Error" msgstr "" -#: cups/ppd-cache.c:3125 +#: cups/ppd-cache.c:3124 msgid "Saddle Stitch" msgstr "" -#: cups/ppd-cache.c:3611 +#: cups/ppd-cache.c:3610 msgid "Satin Labels" msgstr "" -#: cups/ppd-cache.c:3560 +#: cups/ppd-cache.c:3559 msgid "Satin Optical Disc" msgstr "" -#: cups/ppd-cache.c:3634 +#: cups/ppd-cache.c:3633 msgid "Satin Photo Paper" msgstr "" -#: cups/ppd-cache.c:3648 +#: cups/ppd-cache.c:3647 msgid "Screen" msgstr "" -#: cups/ppd-cache.c:3649 +#: cups/ppd-cache.c:3648 msgid "Screen Paged" msgstr "" -#: cups/ppd-cache.c:3612 +#: cups/ppd-cache.c:3611 msgid "Security Labels" msgstr "" @@ -6113,11 +6113,11 @@ msgstr "" msgid "See remote printer." msgstr "" -#: cups/ppd-cache.c:3650 +#: cups/ppd-cache.c:3649 msgid "Self Adhesive" msgstr "" -#: cups/ppd-cache.c:3651 +#: cups/ppd-cache.c:3650 msgid "Self Adhesive Film" msgstr "" @@ -6125,19 +6125,19 @@ msgstr "" msgid "Self-signed credentials are blocked." msgstr "" -#: cups/ppd-cache.c:3584 +#: cups/ppd-cache.c:3583 msgid "Semi-Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3613 +#: cups/ppd-cache.c:3612 msgid "Semi-Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3561 +#: cups/ppd-cache.c:3560 msgid "Semi-Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3635 +#: cups/ppd-cache.c:3634 msgid "Semi-Gloss Photo Paper" msgstr "" @@ -6194,63 +6194,63 @@ msgstr "" msgid "Shipping Address" msgstr "" -#: cups/ppd-cache.c:3779 ppdc/sample.c:265 +#: cups/ppd-cache.c:3778 ppdc/sample.c:265 msgid "Short-Edge (Landscape)" msgstr "" -#: cups/ppd-cache.c:3652 +#: cups/ppd-cache.c:3651 msgid "Shrink Foil" msgstr "" -#: cups/ppd-cache.c:3466 +#: cups/ppd-cache.c:3465 msgid "Side" msgstr "" -#: cups/ppd-cache.c:3860 +#: cups/ppd-cache.c:3859 msgid "Side Tray" msgstr "" -#: cups/ppd-cache.c:3653 +#: cups/ppd-cache.c:3652 msgid "Single Face" msgstr "" -#: cups/ppd-cache.c:3116 +#: cups/ppd-cache.c:3115 msgid "Single Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3115 +#: cups/ppd-cache.c:3114 msgid "Single Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3105 +#: cups/ppd-cache.c:3104 msgid "Single Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3106 +#: cups/ppd-cache.c:3105 msgid "Single Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3134 +#: cups/ppd-cache.c:3133 msgid "Single Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3133 +#: cups/ppd-cache.c:3132 msgid "Single Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3127 +#: cups/ppd-cache.c:3126 msgid "Single Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3128 +#: cups/ppd-cache.c:3127 msgid "Single Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3654 +#: cups/ppd-cache.c:3653 msgid "Single Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:3655 +#: cups/ppd-cache.c:3654 msgid "Sleeve" msgstr "" @@ -6263,43 +6263,43 @@ msgstr "" msgid "Spooling job, %.0f%% complete." msgstr "" -#: cups/ppd-cache.c:3861 +#: cups/ppd-cache.c:3860 msgid "Stacker 1" msgstr "" -#: cups/ppd-cache.c:3870 +#: cups/ppd-cache.c:3869 msgid "Stacker 10" msgstr "" -#: cups/ppd-cache.c:3862 +#: cups/ppd-cache.c:3861 msgid "Stacker 2" msgstr "" -#: cups/ppd-cache.c:3863 +#: cups/ppd-cache.c:3862 msgid "Stacker 3" msgstr "" -#: cups/ppd-cache.c:3864 +#: cups/ppd-cache.c:3863 msgid "Stacker 4" msgstr "" -#: cups/ppd-cache.c:3865 +#: cups/ppd-cache.c:3864 msgid "Stacker 5" msgstr "" -#: cups/ppd-cache.c:3866 +#: cups/ppd-cache.c:3865 msgid "Stacker 6" msgstr "" -#: cups/ppd-cache.c:3867 +#: cups/ppd-cache.c:3866 msgid "Stacker 7" msgstr "" -#: cups/ppd-cache.c:3868 +#: cups/ppd-cache.c:3867 msgid "Stacker 8" msgstr "" -#: cups/ppd-cache.c:3869 +#: cups/ppd-cache.c:3868 msgid "Stacker 9" msgstr "" @@ -6307,27 +6307,27 @@ msgstr "" msgid "Standard" msgstr "" -#: cups/ppd-cache.c:3126 +#: cups/ppd-cache.c:3125 cups/ppd-cache.c:3931 msgid "Staple" msgstr "" -#: cups/ppd-cache.c:3084 +#: cups/ppd-cache.c:3083 msgid "Staple Edge" msgstr "" -#: cups/ppd-cache.c:3088 +#: cups/ppd-cache.c:3087 msgid "Staple Edge (Landscape)" msgstr "" -#: cups/ppd-cache.c:3086 +#: cups/ppd-cache.c:3085 msgid "Staple Edge (Portrait)" msgstr "" -#: cups/ppd-cache.c:3085 +#: cups/ppd-cache.c:3084 msgid "Staple Edge (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3087 +#: cups/ppd-cache.c:3086 msgid "Staple Edge (Reverse Portrait)" msgstr "" @@ -6372,7 +6372,7 @@ msgstr "" msgid "Switching Protocols" msgstr "" -#: cups/ppd-cache.c:3668 +#: cups/ppd-cache.c:3667 msgid "Tab Stock" msgstr "" @@ -6628,23 +6628,23 @@ msgstr "" msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" -#: cups/ppd-cache.c:3463 +#: cups/ppd-cache.c:3462 msgid "Top" msgstr "" -#: cups/ppd-cache.c:3871 +#: cups/ppd-cache.c:3870 msgid "Top Tray" msgstr "" -#: cups/ppd-cache.c:3669 +#: cups/ppd-cache.c:3668 msgid "Tractor" msgstr "" -#: cups/ppd-cache.c:3670 +#: cups/ppd-cache.c:3669 msgid "Transfer" msgstr "" -#: cups/ppd-cache.c:3671 ppdc/sample.c:284 +#: cups/ppd-cache.c:3670 ppdc/sample.c:284 msgid "Transparency" msgstr "" @@ -6652,103 +6652,103 @@ msgstr "" msgid "Tray" msgstr "" -#: cups/ppd-cache.c:3472 cups/ppd-cache.c:3872 ppdc/sample.c:256 +#: cups/ppd-cache.c:3471 cups/ppd-cache.c:3871 ppdc/sample.c:256 msgid "Tray 1" msgstr "" -#: cups/ppd-cache.c:3481 cups/ppd-cache.c:3881 +#: cups/ppd-cache.c:3480 cups/ppd-cache.c:3880 msgid "Tray 10" msgstr "" -#: cups/ppd-cache.c:3482 +#: cups/ppd-cache.c:3481 msgid "Tray 11" msgstr "" -#: cups/ppd-cache.c:3483 +#: cups/ppd-cache.c:3482 msgid "Tray 12" msgstr "" -#: cups/ppd-cache.c:3484 +#: cups/ppd-cache.c:3483 msgid "Tray 13" msgstr "" -#: cups/ppd-cache.c:3485 +#: cups/ppd-cache.c:3484 msgid "Tray 14" msgstr "" -#: cups/ppd-cache.c:3486 +#: cups/ppd-cache.c:3485 msgid "Tray 15" msgstr "" -#: cups/ppd-cache.c:3487 +#: cups/ppd-cache.c:3486 msgid "Tray 16" msgstr "" -#: cups/ppd-cache.c:3488 +#: cups/ppd-cache.c:3487 msgid "Tray 17" msgstr "" -#: cups/ppd-cache.c:3489 +#: cups/ppd-cache.c:3488 msgid "Tray 18" msgstr "" -#: cups/ppd-cache.c:3490 +#: cups/ppd-cache.c:3489 msgid "Tray 19" msgstr "" -#: cups/ppd-cache.c:3473 cups/ppd-cache.c:3873 ppdc/sample.c:257 +#: cups/ppd-cache.c:3472 cups/ppd-cache.c:3872 ppdc/sample.c:257 msgid "Tray 2" msgstr "" -#: cups/ppd-cache.c:3491 +#: cups/ppd-cache.c:3490 msgid "Tray 20" msgstr "" -#: cups/ppd-cache.c:3474 cups/ppd-cache.c:3874 ppdc/sample.c:258 +#: cups/ppd-cache.c:3473 cups/ppd-cache.c:3873 ppdc/sample.c:258 msgid "Tray 3" msgstr "" -#: cups/ppd-cache.c:3475 cups/ppd-cache.c:3875 ppdc/sample.c:259 +#: cups/ppd-cache.c:3474 cups/ppd-cache.c:3874 ppdc/sample.c:259 msgid "Tray 4" msgstr "" -#: cups/ppd-cache.c:3476 cups/ppd-cache.c:3876 +#: cups/ppd-cache.c:3475 cups/ppd-cache.c:3875 msgid "Tray 5" msgstr "" -#: cups/ppd-cache.c:3477 cups/ppd-cache.c:3877 +#: cups/ppd-cache.c:3476 cups/ppd-cache.c:3876 msgid "Tray 6" msgstr "" -#: cups/ppd-cache.c:3478 cups/ppd-cache.c:3878 +#: cups/ppd-cache.c:3477 cups/ppd-cache.c:3877 msgid "Tray 7" msgstr "" -#: cups/ppd-cache.c:3479 cups/ppd-cache.c:3879 +#: cups/ppd-cache.c:3478 cups/ppd-cache.c:3878 msgid "Tray 8" msgstr "" -#: cups/ppd-cache.c:3480 cups/ppd-cache.c:3880 +#: cups/ppd-cache.c:3479 cups/ppd-cache.c:3879 msgid "Tray 9" msgstr "" -#: cups/ppd-cache.c:3138 +#: cups/ppd-cache.c:3137 msgid "Triple Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3136 +#: cups/ppd-cache.c:3135 msgid "Triple Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3135 +#: cups/ppd-cache.c:3134 msgid "Triple Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3137 +#: cups/ppd-cache.c:3136 msgid "Triple Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3672 +#: cups/ppd-cache.c:3671 msgid "Triple Wall Cardboard" msgstr "" @@ -7432,7 +7432,7 @@ msgstr "" msgid "VarBind uses indefinite length" msgstr "" -#: cups/ppd-cache.c:3660 +#: cups/ppd-cache.c:3659 msgid "Vellum Paper" msgstr "" @@ -7456,7 +7456,7 @@ msgstr "" msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" -#: cups/ppd-cache.c:3585 +#: cups/ppd-cache.c:3584 msgid "Waterproof Fabric" msgstr "" @@ -7464,11 +7464,11 @@ msgstr "" msgid "Web Interface is Disabled" msgstr "" -#: cups/ppd-cache.c:3673 +#: cups/ppd-cache.c:3672 msgid "Wet Film" msgstr "" -#: cups/ppd-cache.c:3578 +#: cups/ppd-cache.c:3577 msgid "Windowed Envelope" msgstr "" @@ -7481,7 +7481,7 @@ msgstr "" msgid "You must access this page using the URL https://%s:%d%s." msgstr "" -#: cups/ppd-cache.c:3101 +#: cups/ppd-cache.c:3100 msgid "Z Fold" msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 691103caa..8f59b0cc0 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -771,6 +771,7 @@ "Bind (Reverse Portrait)" = "Bind (Reverse Portrait)"; "Bond Envelope" = "Bond Envelope"; "Bond Paper" = "Bond Paper"; +"Booklet" = "Booklet"; "Booklet Maker" = "Booklet Maker"; "Boolean expected for waiteof option \"%s\"." = "Boolean expected for waiteof option “%s”."; "Bottom" = "Bottom"; @@ -958,7 +959,6 @@ "Film" = "Film"; "Fine Envelope" = "Fine Envelope"; "Finished page %d." = "Finished page %d."; -"Finishing" = "Finishing"; "Flexo Base" = "Flexo Base"; "Flexo Photo Polymer" = "Flexo Photo Polymer"; "Flute" = "Flute"; @@ -1187,7 +1187,6 @@ "New credentials are older than stored credentials." = "New credentials are older than stored credentials."; "No" = "No"; "No Content" = "No Content"; -"No Finishing" = "No Finishing"; "No IPP attributes." = "No IPP attributes."; "No PPD name" = "No PPD name"; "No VarBind SEQUENCE" = "No VarBind SEQUENCE"; @@ -1223,6 +1222,7 @@ "No version number" = "No version number"; "Non-continuous (Mark sensing)" = "Non-continuous (Mark sensing)"; "Non-continuous (Web sensing)" = "Non-continuous (Web sensing)"; +"None" = "None"; "Normal" = "Normal"; "Not Found" = "Not Found"; "Not Implemented" = "Not Implemented"; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 582c2dd33..f3e246db2 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -2967,6 +2967,9 @@ msgstr "" msgid "Bond Paper" msgstr "Paper de valors" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3570,9 +3573,6 @@ msgstr "" msgid "Finished page %d." msgstr "S'ha acabat la pàgina %d." -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4283,9 +4283,6 @@ msgstr "No" msgid "No Content" msgstr "No hi ha contingut" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4394,6 +4391,9 @@ msgstr "Discontinu (sensible a les marques)" msgid "Non-continuous (Web sensing)" msgstr "Discontinu (Sensible al web)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normal" diff --git a/locale/cups_cs.po b/locale/cups_cs.po index 5eca5dc47..e83c0ede2 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -2774,6 +2774,9 @@ msgstr "" msgid "Bond Paper" msgstr "Kancelářský papír" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3367,9 +3370,6 @@ msgstr "" msgid "Finished page %d." msgstr "" -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4073,9 +4073,6 @@ msgstr "Ne" msgid "No Content" msgstr "Žádný obsah" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4182,6 +4179,9 @@ msgstr "Není souvislý (Mark Sensing)" msgid "Non-continuous (Web sensing)" msgstr "Není souvislý (Web Sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normální" diff --git a/locale/cups_de.po b/locale/cups_de.po index 26cd1a94b..92abfcba0 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2016-09-17 18:45+0200\n" "Last-Translator: Joachim Schwender \n" "Language-Team: LANGUAGE \n" @@ -2850,6 +2850,9 @@ msgstr "" msgid "Bond Paper" msgstr "Papier bündeln" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3447,9 +3450,6 @@ msgstr "" msgid "Finished page %d." msgstr "Seite %d fertiggestellt." -msgid "Finishing" -msgstr "Endverarbeitung" - msgid "Flexo Base" msgstr "" @@ -4154,9 +4154,6 @@ msgstr "Nein" msgid "No Content" msgstr "Kein Inhalt" -msgid "No Finishing" -msgstr "Keine Endverarbeitung" - msgid "No IPP attributes." msgstr "" @@ -4264,6 +4261,9 @@ msgstr "Nicht fortlaufend (Mark-Sensing)" msgid "Non-continuous (Web sensing)" msgstr "Nicht fortlaufend (Web-Sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normal" @@ -6755,12 +6755,18 @@ msgstr "variable-bindings hat unbestimmte Länge" #~ msgid "File Folder " #~ msgstr "Datei-Verzeichnis " +#~ msgid "Finishing" +#~ msgstr "Endverarbeitung" + #~ msgid "New Stylus Color Series" #~ msgstr "Neue Stylus Color Serie" #~ msgid "New Stylus Photo Series" #~ msgstr "Neue Stylus Photo Serie" +#~ msgid "No Finishing" +#~ msgstr "Keine Endverarbeitung" + #~ msgid "Postcard Double " #~ msgstr "Doppelpostkarte" diff --git a/locale/cups_es.po b/locale/cups_es.po index b85f26d75..6a8e8cbe3 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2016-06-26 21:17+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -3043,6 +3043,9 @@ msgstr "" msgid "Bond Paper" msgstr "Papel de cartas" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "Fabricante de folleto" @@ -3646,9 +3649,6 @@ msgstr "" msgid "Finished page %d." msgstr "Acabada la página %d." -msgid "Finishing" -msgstr "Terminando" - msgid "Flexo Base" msgstr "" @@ -4356,9 +4356,6 @@ msgstr "No" msgid "No Content" msgstr "No hay contenido" -msgid "No Finishing" -msgstr "Sin terminar" - msgid "No IPP attributes." msgstr "" @@ -4467,6 +4464,9 @@ msgstr "No continuo (sensible a señal)" msgid "Non-continuous (Web sensing)" msgstr "No continuo (sensible a web)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normal" @@ -6995,6 +6995,9 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "CD/DVD/Bluray" #~ msgstr "CD/DVD/Bluray" +#~ msgid "Finishing" +#~ msgstr "Terminando" + #~ msgid "Glossy Photo" #~ msgstr "Foto brillante" @@ -7010,6 +7013,9 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "Matte Photo" #~ msgstr "Foto mate" +#~ msgid "No Finishing" +#~ msgstr "Sin terminar" + #~ msgid "Satin Photo" #~ msgstr "Foto satinada" diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 5555369ce..8348fb01a 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma \n" "Language-Team: LANGUAGE \n" @@ -2774,6 +2774,9 @@ msgstr "" msgid "Bond Paper" msgstr "Papier pour titres" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3364,9 +3367,6 @@ msgstr "" msgid "Finished page %d." msgstr "" -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4070,9 +4070,6 @@ msgstr "Non" msgid "No Content" msgstr "Aucun contenu" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4179,6 +4176,9 @@ msgstr "Non continu (détection de marque)" msgid "Non-continuous (Web sensing)" msgstr "Non continu (détection Web)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normal" diff --git a/locale/cups_it.po b/locale/cups_it.po index 336283083..b3920bdb4 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -3041,6 +3041,9 @@ msgstr "" msgid "Bond Paper" msgstr "Carta per scrivere" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3646,9 +3649,6 @@ msgstr "" msgid "Finished page %d." msgstr "Finito pagina %d." -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4356,9 +4356,6 @@ msgstr "No" msgid "No Content" msgstr "Nessun contenuto" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4467,6 +4464,9 @@ msgstr "Non-continuous (Mark sensing)" msgid "Non-continuous (Web sensing)" msgstr "Non-continuous (Web sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normale" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index c20d11242..631e5e366 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2014-11-15 19:27+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -3000,6 +3000,9 @@ msgstr "" msgid "Bond Paper" msgstr "ボンド紙" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3609,9 +3612,6 @@ msgstr "" msgid "Finished page %d." msgstr "ページ %d を終了。" -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4319,9 +4319,6 @@ msgstr "いいえ" msgid "No Content" msgstr "中身がありません" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4428,6 +4425,9 @@ msgstr "非連続です (Mark sensing)" msgid "Non-continuous (Web sensing)" msgstr "非連続です (Web sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "標準" diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po index a257d3d13..70ab422c9 100644 --- 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-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2016-01-31 16:45-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -3042,6 +3042,9 @@ msgstr "" msgid "Bond Paper" msgstr "Papel autocolante" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3646,9 +3649,6 @@ msgstr "" msgid "Finished page %d." msgstr "Terminou página %d." -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4356,9 +4356,6 @@ msgstr "Não" msgid "No Content" msgstr "Nenhum conteúdo" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4467,6 +4464,9 @@ msgstr "Não-contíguo (Mark sensing)" msgid "Non-continuous (Web sensing)" msgstr "Não-contíguo (Web sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Normal" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index f62cd0656..491aef5f7 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2017-03-10 12:18-0500\n" +"POT-Creation-Date: 2017-03-10 13:51-0500\n" "PO-Revision-Date: 2015-01-28 12:00-0800\n" "Last-Translator: Aleksandr Proklov\n" "Language-Team: PuppyRus Linux Team\n" @@ -2974,6 +2974,9 @@ msgstr "" msgid "Bond Paper" msgstr "Документная бумага" +msgid "Booklet" +msgstr "" + msgid "Booklet Maker" msgstr "" @@ -3572,9 +3575,6 @@ msgstr "" msgid "Finished page %d." msgstr "Последняя страница %d." -msgid "Finishing" -msgstr "" - msgid "Flexo Base" msgstr "" @@ -4282,9 +4282,6 @@ msgstr "Нет" msgid "No Content" msgstr "Нет содержимого" -msgid "No Finishing" -msgstr "" - msgid "No IPP attributes." msgstr "" @@ -4392,6 +4389,9 @@ msgstr "С прерыванием (Mark sensing)" msgid "Non-continuous (Web sensing)" msgstr "С прерыванием (Web sensing)" +msgid "None" +msgstr "" + msgid "Normal" msgstr "Нормальный" -- 2.39.5