From 3fb9c47ea669977c856ad82b3ea593ec76d136ec Mon Sep 17 00:00:00 2001 From: msweet Date: Sat, 7 Nov 2009 06:21:32 +0000 Subject: [PATCH] Merge changes from CUPS 1.5svn-r8857. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1736 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.4.txt | 2 +- backend/usb-darwin.c | 6 +- doc/de/index.html.in | 2 +- doc/help/ref-ppdcfile.html | 165 ++++++++++--------- templates/de/set-printer-options-header.tmpl | 2 +- templates/ru/admin.tmpl | 2 +- 6 files changed, 93 insertions(+), 86 deletions(-) diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt index 8d86a49ead..e83ba0332a 100644 --- a/CHANGES-1.4.txt +++ b/CHANGES-1.4.txt @@ -3,6 +3,7 @@ CHANGES-1.4.txt CHANGES IN CUPS V1.4.2 + - Fixed localization errors (STR #3359, STR #3372, STR #3380, STR #3387) - The documentation for classes.conf and printers.conf did not provide the correct instructions for manual changes (STR #3351) - The scheduler did not always rebuild printer cache files when the @@ -15,7 +16,6 @@ CHANGES IN CUPS V1.4.2 (STR #3346) - The cupstestppd program incorrectly reported filters with bad permisssions as missing (STR #3363) - - The Russian web interface templates had errors (STR #3359) - The cups.desktop file used the wrong locale names (STR #3358) - cupsSideChannelRead() did not return an error for short reads. - The installed PAM configuration file did not use the correct options diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index b423f1b16a..d40e60a438 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -697,7 +697,7 @@ print_device(const char *uri, /* I - Device URI */ else if (iostatus == kIOReturnAborted) { - fputs("DEBUG: Got return aborted during write\n", stderr); + fputs("DEBUG: Got USB return aborted during write\n", stderr); IOReturn err = (*g.classdriver)->Abort(g.classdriver); fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n", err); @@ -897,11 +897,11 @@ static void *read_thread(void *reference) #endif } else if (readstatus == kIOUSBTransactionTimeout) - fputs("DEBUG: Got USB transaction timeout during write\n", stderr); + fputs("DEBUG: Got USB transaction timeout during read\n", stderr); else if (readstatus == kIOUSBPipeStalled) fputs("DEBUG: Got USB pipe stalled during read\n", stderr); else if (readstatus == kIOReturnAborted) - fputs("DEBUG: Got return aborted during read\n", stderr); + fputs("DEBUG: Got USB return aborted during read\n", stderr); /* * Make sure this loop executes no more than once every 250 miliseconds... diff --git a/doc/de/index.html.in b/doc/de/index.html.in index 4a49f507e5..becebc2a09 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -17,7 +17,7 @@ SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT="">   Verwaltung     Klassen     On-Line Hilfe   -  Auftrüge   +  Aufträge     Drucker  
inclusion in a driver. The name with optional user text defines the name for the media size and is used with the MediaSize directive to associate -the media size with the driver. The name may only contain -letters, numbers, and the underscore and may not exceed 40 -characters in length. The user text, if supplied, may not exceed -80 characters in length.

+the media size with the driver. The name may contain up to 40 ASCII +characters within the range of decimal 33 to decimal 126 inclusive, +except for the characters comma (44), slash (47) and colon (58). +The user text, if supplied, may not exceed 80 bytes in length.

The width and length define the dimensions of the media. Each number is optionally followed by one of the following unit @@ -459,17 +459,15 @@ Attribute fooProfile "Photo/Photographic Profile" "photopro.icc"

Description

The Attribute directive creates a PPD attribute. The -name is any combination of letters, numbers, and the underscore -and can be up to 40 characters in length.

+name may contain up to 40 ASCII characters within the range of decimal +33 to decimal 126 inclusive, except for the characters comma (44), +slash (47) and colon (58).

-

The selector can be the empty string (""), a keyword -consisting of up to 40 letters, numbers, and the underscore, or -a string composed of a keyword and user text of up to 80 -characters.

+

The selector can be the empty string ("") or text of up +to 80 bytes.

-

The value is any string or number; the string may contain -multiple lines, however no one line may exceed 255 -characters.

+

The value is any string or number; the string may contain multiple +lines, however no one line may exceed 255 bytes.

See Also

@@ -495,14 +493,15 @@ Choice "False/No" "<</cupsCompression 0>>setpagedevice"

Description

The Choice directive adds a single choice to the -current option. The name is any combination of letters, numbers, -and the underscore and can be up to 40 characters in length.

+current option. The name may contain up to 40 ASCII characters within +the range of decimal 33 to decimal 126 inclusive, except for the +characters comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters +

If provided, the text can be any string up to 80 bytes in length. If no text is provided, the name is used.

The code is any string and may contain multiple lines, -however no one line may exceed 255 characters.

+however no one line may exceed 255 bytes.

See Also

@@ -568,11 +567,12 @@ ColorModel CMYK cmyk chunky 0

The ColorModel directive is a convenience directive which creates a ColorModel option and choice for the current -printer driver. The name is any combination of letters, numbers, -and the underscore and can be up to 40 characters in length.

+printer driver. The name may contain up to 40 ASCII characters within +the range of decimal 33 to decimal 126 inclusive, except for the +characters comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

The colorspace argument is one of the standard colorspace keywords defined later in this appendix in the section titled, @@ -698,7 +698,7 @@ MA 02111 USA"

The Copyright directive adds text comments to the top of a PPD file, typically for use in copyright notices. The text argument can contain multiple lines of text, but no line -may exceed 255 characters.

+may exceed 255 bytes.

CustomMedia

@@ -730,11 +730,12 @@ CustomMedia "A4/A4 - 210x297mm" 210mm 297mm 12 12 12 12

Description

The CustomMedia directive adds a custom media size to -the driver. The name is any combination of letters, numbers, -and the underscore and can be up to 40 characters in length.

+the driver. The name may contain up to 40 ASCII characters within the +range of decimal 33 to decimal 126 inclusive, except for the characters +comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

The width and length arguments specify the dimensions of the media as defined for the #media @@ -747,7 +748,7 @@ printable margins of the media.

PostScript commands to run for the PageSize and PageRegion options, respectively. The commands can contain multiple lines, however no line may be more than 255 -characters in length.

+bytes in length.

See Also

@@ -823,11 +824,12 @@ therefore the darkness of the print.

the Dymo driver from 0 (lowest) to 3 (highest), with 2 representing the normal setting.

-

The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length.

+

The name may contain up to 40 ASCII characters within the range of +decimal 33 to decimal 126 inclusive, except for the characters comma +(44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

See Also

@@ -1044,14 +1046,15 @@ Finishing "Glossy/Photo Overcoat"

Description

The Finishing directive adds a choice to the -cupsFinishing option. The name is any combination of -letters, numbers, and the underscore and can be up to 40 -characters in length. The name is stored in the -OutputType attribute in the PostScript page device -dictionary.

+cupsFinishing option. The name may contain up to 40 ASCII +characters within the range of decimal 33 to decimal 126 inclusive, +except for the characters comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

+ +

The name is stored in the OutputType attribute in the +PostScript page device dictionary.

See Also

@@ -1091,8 +1094,7 @@ Font Unicode-Foo Expert "(2.0)" Adobe-Identity ROM

Description

The Font directive defines a "device font" for the -current printer driver. The name is the PostScript font -name.

+current printer driver. The name is the PostScript font name.

The encoding is the default encoding of the font, usually Standard, Expert, or Special, as @@ -1139,14 +1141,16 @@ Group "Special/Vendor Options"

Description

The Group directive specifies the group for new -Option directives. The name is any combination of -letters, numbers, and the underscore and can be up to 40 -characters in length. The names General and -InstallableOptions are predefined for the standard -Adobe UI keywords and for installable options, respectively.

+Option directives. The name may contain up to 40 ASCII +characters within the range of decimal 33 to decimal 126 inclusive, +except for the characters comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 40 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 40 bytes in length. +If no text is provided, the name is used.

+ +

The names General and InstallableOptions +are predefined for the standard Adobe UI keywords and for installable +options, respectively.

@@ -1154,8 +1158,8 @@ in length. If no text is provided, the name is used.

Because of certain API binary compatibility issues, CUPS limits the length of PPD group translation strings - (text) to 40 characters, while the PPD specification - allows for up to 80 characters.

+ (text) to 40 bytes, while the PPD specification + allows for up to 80 bytes.

@@ -1229,11 +1233,12 @@ from 0 to 232-1 specifying the value that is placed in the MediaPosition attribute in the PostScript page device dictionary.

-

The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length.

+

The name may contain up to 40 ASCII characters within the range of +decimal 33 to decimal 126 inclusive, except for the characters comma +(44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

See Also

@@ -1271,11 +1276,12 @@ Installable "Option1/Duplexer Installed"

The Installable directive adds a new boolean option to the InstallableOptions group with a default value of -False. The name is any combination of letters, numbers, -and the underscore and can be up to 40 characters in length.

+False. The name may contain up to 40 ASCII characters +within the range of decimal 33 to decimal 126 inclusive, except for +the characters comma (44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

LocAttribute

@@ -1295,17 +1301,15 @@ LocAttribute fooProfile "Photo/Photographic Profile" "photopro.icc"

Description

The LocAttribute directive creates a localized PPD -attribute. The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length.

+attribute. The name may contain up to 40 ASCII characters within the +range of decimal 33 to decimal 126 inclusive, except for the characters +comma (44), slash (47) and colon (58).

-

The selector can be the empty string (""), a keyword -consisting of up to 40 letters, numbers, and the underscore, or -a string composed of a keyword and user text of up to 80 -characters.

+

The selector can be the empty string ("") or text of up +to 80 bytes.

-

The value is any string or number; the string may contain -multiple lines, however no one line may exceed 255 -characters.

+

The value is any string or number; the string may contain multiple +lines, however no one line may exceed 255 bytes.

See Also

@@ -1458,13 +1462,15 @@ from 0 to 232-1 specifying the value that is placed in the cupsMediaType attribute in the PostScript page device dictionary.

-

The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length. The name is -placed in the MediaType attribute in the PostScript -page device dictionary.

+

The name may contain up to 40 ASCII characters within the range of +decimal 33 to decimal 126 inclusive, except for the characters comma +(44), slash (47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

+ +

The name is placed in the MediaType attribute in the +PostScript page device dictionary.

See Also

@@ -1532,7 +1538,7 @@ name is any string of letters, numbers, spaces, and the characters ".", "/", "-", and "+" and should not begin with the manufacturer name since the PPD compiler will add this automatically for you. The maximum length of the name string is -31 characters to conform to the Adobe limits on the length of +31 bytes to conform to the Adobe limits on the length of ShortNickName.

See Also

@@ -1598,11 +1604,12 @@ Option "fooFinish/Finishing Option" PickOne DocumentSetup 10

The Option directive creates a new option in the current group, by default the General group. The name -is any combination of letters, numbers, and the underscore and -can be up to 40 characters in length.

+may contain up to 40 ASCII characters within the range of decimal 33 +to decimal 126 inclusive, except for the characters comma (44), slash +(47) and colon (58).

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

The type argument is one of the following keywords:

@@ -1749,8 +1756,8 @@ for asymmetric resolutions. The HHH and VVV in the examples represent the horizontal and vertical resolutions which must be positive integer values.

-

If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.

+

If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.

See Also

diff --git a/templates/de/set-printer-options-header.tmpl b/templates/de/set-printer-options-header.tmpl index dbe93f658f..b4187e3219 100644 --- a/templates/de/set-printer-options-header.tmpl +++ b/templates/de/set-printer-options-header.tmpl @@ -1,6 +1,6 @@
-

Standardeinstellungen f%uuml;r {printer_name} festlegen

+

Standardeinstellungen für {printer_name} festlegen

diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl index 17287d0880..dafb5fd965 100644 --- a/templates/ru/admin.tmpl +++ b/templates/ru/admin.tmpl @@ -31,7 +31,7 @@
-
+

{SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-- 2.47.2