diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-11-07 06:21:32 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-11-07 06:21:32 +0000 |
commit | 3fb9c47ea669977c856ad82b3ea593ec76d136ec (patch) | |
tree | 9422bf9cef91c69dc613f2c8632010dee8f2abfe | |
parent | 101decd054f464e3c83199d5842d831424235ac5 (diff) |
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
-rw-r--r-- | CHANGES-1.4.txt | 2 | ||||
-rw-r--r-- | backend/usb-darwin.c | 6 | ||||
-rw-r--r-- | doc/de/index.html.in | 2 | ||||
-rw-r--r-- | doc/help/ref-ppdcfile.html | 165 | ||||
-rw-r--r-- | templates/de/set-printer-options-header.tmpl | 2 | ||||
-rw-r--r-- | 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 8d86a49ea..e83ba0332 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 b423f1b16..d40e60a43 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 4a49f507e..becebc2a0 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=""></A></TD> <TD CLASS="unsel"><A HREF="/admin"> Verwaltung </A></TD> <TD CLASS="unsel"><A HREF="/classes/"> Klassen </A></TD> <TD CLASS="unsel"><A HREF="/help/"> On-Line Hilfe </A></TD> -<TD CLASS="unsel"><A HREF="/jobs/"> Auftrüge </A></TD> +<TD CLASS="unsel"><A HREF="/jobs/"> Aufträge </A></TD> <TD CLASS="unsel"><A HREF="/printers/"> Drucker </A></TD> <TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help" diff --git a/doc/help/ref-ppdcfile.html b/doc/help/ref-ppdcfile.html index 48637abc7..696b7827d 100644 --- a/doc/help/ref-ppdcfile.html +++ b/doc/help/ref-ppdcfile.html @@ -380,10 +380,10 @@ least 100 files.</p> inclusion in a driver. The name with optional user text defines the name for the media size and is used with the <a href='#MediaSize'><code>MediaSize</code></a> 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.</p> +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.</p> <p>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" <h3>Description</h3> <p>The <code>Attribute</code> 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.</p> +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).</p> -<p>The selector can be the empty string (<code>""</code>), 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.</p> +<p>The selector can be the empty string (<code>""</code>) or text of up +to 80 bytes.</p> -<p>The value is any string or number; the string may contain -multiple lines, however no one line may exceed 255 -characters.</p> +<p>The value is any string or number; the string may contain multiple +lines, however no one line may exceed 255 bytes.</p> <h3>See Also</h3> @@ -495,14 +493,15 @@ Choice "False/No" "<</cupsCompression 0>>setpagedevice" <h3>Description</h3> <p>The <code>Choice</code> 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.</p> +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).</p> -<p>If provided, the text can be any string up to 80 characters +<p>If provided, the text can be any string up to 80 bytes in length. If no text is provided, the name is used.</p> <p>The code is any string and may contain multiple lines, -however no one line may exceed 255 characters.</p> +however no one line may exceed 255 bytes.</p> <h3>See Also</h3> @@ -568,11 +567,12 @@ ColorModel CMYK cmyk chunky 0 <p>The <code>ColorModel</code> 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.</p> +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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <p>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" <p>The <code>Copyright</code> 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.</p> +may exceed 255 bytes.</p> <h2 class="title"><a name='CustomMedia'>CustomMedia</a></h2> @@ -730,11 +730,12 @@ CustomMedia "A4/A4 - 210x297mm" 210mm 297mm 12 12 12 12 <h3>Description</h3> <p>The <code>CustomMedia</code> 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.</p> +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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <p>The width and length arguments specify the dimensions of the media as defined for the <a href="#_media"><code>#media</code></a> @@ -747,7 +748,7 @@ printable margins of the media.</p> PostScript commands to run for the <code>PageSize</code> and <code>PageRegion</code> options, respectively. The commands can contain multiple lines, however no line may be more than 255 -characters in length.</p> +bytes in length.</p> <h3>See Also</h3> @@ -823,11 +824,12 @@ therefore the darkness of the print.</p> the Dymo driver from 0 (lowest) to 3 (highest), with 2 representing the normal setting.</p> -<p>The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length.</p> +<p>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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <h3>See Also</h3> @@ -1044,14 +1046,15 @@ Finishing "Glossy/Photo Overcoat" <h3>Description</h3> <p>The <code>Finishing</code> directive adds a choice to the -<code>cupsFinishing</code> 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 -<code>OutputType</code> attribute in the PostScript page device -dictionary.</p> +<code>cupsFinishing</code> 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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> + +<p>The name is stored in the <code>OutputType</code> attribute in the +PostScript page device dictionary.</p> <h3>See Also</h3> @@ -1091,8 +1094,7 @@ Font Unicode-Foo Expert "(2.0)" Adobe-Identity ROM <h3>Description</h3> <p>The <code>Font</code> directive defines a "device font" for the -current printer driver. The name is the PostScript font -name.</p> +current printer driver. The name is the PostScript font name.</p> <p>The encoding is the default encoding of the font, usually <code>Standard</code>, <code>Expert</code>, or <code>Special</code>, as @@ -1139,14 +1141,16 @@ Group "Special/Vendor Options" <h3>Description</h3> <p>The <code>Group</code> directive specifies the group for new -<code>Option</code> directives. The name is any combination of -letters, numbers, and the underscore and can be up to 40 -characters in length. The names <code>General</code> and -<code>InstallableOptions</code> are predefined for the standard -Adobe UI keywords and for installable options, respectively.</p> +<code>Option</code> 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).</p> -<p>If provided, the text can be any string up to 40 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 40 bytes in length. +If no text is provided, the name is used.</p> + +<p>The names <code>General</code> and <code>InstallableOptions</code> +are predefined for the standard Adobe UI keywords and for installable +options, respectively.</p> <center><table width='80%' border='1' bgcolor='#cccccc' cellpadding='5' cellspacing='0'> <tr> @@ -1154,8 +1158,8 @@ in length. If no text is provided, the name is used.</p> <p>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.</p> + (text) to 40 bytes, while the PPD specification + allows for up to 80 bytes.</p> </td> </tr> @@ -1229,11 +1233,12 @@ from 0 to 2<sup>32</sup>-1 specifying the value that is placed in the <code>MediaPosition</code> attribute in the PostScript page device dictionary.</p> -<p>The name is any combination of letters, numbers, and the -underscore and can be up to 40 characters in length.</p> +<p>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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <h3>See Also</h3> @@ -1271,11 +1276,12 @@ Installable "Option1/Duplexer Installed" <p>The <code>Installable</code> directive adds a new boolean option to the <code>InstallableOptions</code> group with a default value of -<code>False</code>. The name is any combination of letters, numbers, -and the underscore and can be up to 40 characters in length.</p> +<code>False</code>. 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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <h2 class="title"><a name='LocAttribute'>LocAttribute</a></h2> @@ -1295,17 +1301,15 @@ LocAttribute fooProfile "Photo/Photographic Profile" "photopro.icc" <h3>Description</h3> <p>The <code>LocAttribute</code> 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.</p> +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).</p> -<p>The selector can be the empty string (<code>""</code>), 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.</p> +<p>The selector can be the empty string (<code>""</code>) or text of up +to 80 bytes.</p> -<p>The value is any string or number; the string may contain -multiple lines, however no one line may exceed 255 -characters.</p> +<p>The value is any string or number; the string may contain multiple +lines, however no one line may exceed 255 bytes.</p> <h3>See Also</h3> @@ -1458,13 +1462,15 @@ from 0 to 2<sup>32</sup>-1 specifying the value that is placed in the <code>cupsMediaType</code> attribute in the PostScript page device dictionary.</p> -<p>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 <code>MediaType</code> attribute in the PostScript -page device dictionary.</p> +<p>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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> + +<p>The name is placed in the <code>MediaType</code> attribute in the +PostScript page device dictionary.</p> <h3>See Also</h3> @@ -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 <code>ShortNickName</code>.</p> <h3>See Also</h3> @@ -1598,11 +1604,12 @@ Option "fooFinish/Finishing Option" PickOne DocumentSetup 10 <p>The <code>Option</code> directive creates a new option in the current group, by default the <code>General</code> group. The name -is any combination of letters, numbers, and the underscore and -can be up to 40 characters in length.</p> +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).</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <p>The type argument is one of the following keywords:</p> @@ -1749,8 +1756,8 @@ for asymmetric resolutions. The <code>HHH</code> and <code>VVV</code> in the examples represent the horizontal and vertical resolutions which must be positive integer values.</p> -<p>If provided, the text can be any string up to 80 characters -in length. If no text is provided, the name is used.</p> +<p>If provided, the text can be any string up to 80 bytes in length. +If no text is provided, the name is used.</p> <h3>See Also</h3> diff --git a/templates/de/set-printer-options-header.tmpl b/templates/de/set-printer-options-header.tmpl index dbe93f658..b4187e321 100644 --- a/templates/de/set-printer-options-header.tmpl +++ b/templates/de/set-printer-options-header.tmpl @@ -1,6 +1,6 @@ <DIV CLASS="indent"> -<H2 CLASS="title">Standardeinstellungen f%uuml;r {printer_name} festlegen</H2> +<H2 CLASS="title">Standardeinstellungen für {printer_name} festlegen</H2> <FORM METHOD="POST" ACTION="/admin"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl index 17287d088..dafb5fd96 100644 --- a/templates/ru/admin.tmpl +++ b/templates/ru/admin.tmpl @@ -31,7 +31,7 @@ <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал заданий"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал ошибок"></FORM> -<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"> +<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"></FORM> </P> {SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P> |