From: jlovell Date: Thu, 24 May 2007 18:54:11 +0000 (+0000) Subject: Load cups into easysw/current. X-Git-Tag: release-1.6.3~214 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d8365b8dc12c660de084e4047b8648fc377ed16;p=thirdparty%2Fcups.git Load cups into easysw/current. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@326 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES-1.2.txt b/CHANGES-1.2.txt index ce6be902bc..de8bf75245 100644 --- a/CHANGES-1.2.txt +++ b/CHANGES-1.2.txt @@ -3,6 +3,9 @@ CHANGES-1.2.txt CHANGES IN CUPS V1.2.11 + - Fixed the "relaying from" log message (STR #2376) + - Updated the launchd support on Mac OS X to better + support reconfiguration. - "make distclean" didn't remove all generated files (STR #2366) - Fixed a bug in the advertisement of classes (STR diff --git a/CHANGES.txt b/CHANGES.txt index 3985acf684..942cd4d307 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,8 @@ CHANGES IN CUPS V1.3 - Documentation updates (STR #1775, STR #2130, STR #2131, STR #2263, STR #2356) + - The scheduler did not report Bonjour shared printers as + remote printers (STR #2384) - Added new -R and -W options to the cupstestppd program for greater control over the testing of PPDs. - Added a new cupsGetServerPPD() function for getting @@ -14,11 +16,17 @@ CHANGES IN CUPS V1.3 - Added a new CUPS_GET_PPD operation for getting an available PPD file on the server (STR #2334) - CUPS_GET_PPDS now reports multiple ppd-product values - if the corresponding PPD contains multiple products - (STR #2334) + based on the PPD ModelName and Product strings (STR + #2334, STR #2383) - CUPS_GET_PPDS now reports the PSVersion attributes from a PPD file in the ppd-psversion attribute (STR #2334) + - CUPS_GET_PPDS now reports the cupsModelNumber attribute + from a PPD file in the ppd-model-number attribute (STR + #2383) + - CUPS_GET_PPDS now reports a driver type string in the + ppd-type attribute based on the cupsFax and cupsFilter + attributes in a PPD file (STR #2383) - Added a new printer attribute called "cups-version" which reports the version of CUPS that is running (STR #2240) diff --git a/Makefile b/Makefile index 1cb72a9322..1edbe7939a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 6500 2007-04-30 21:47:48Z mike $" +# "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $" # # Top-level Makefile for the Common UNIX Printing System (CUPS). # @@ -132,12 +132,21 @@ install: installhdrs echo Installing StartupItems files...; \ $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \ echo Installing LaunchDaemons configuration files...; \ $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \ + case `uname -r` in \ + 8.*) \ + $(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \ + $(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \ + $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \ + $(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \ + $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \ + ;; \ + esac \ else \ echo Installing RC script...; \ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ @@ -215,7 +224,9 @@ uninstall: $(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ $(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \ - $(RM) $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ + $(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cupsd.plist; \ + $(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cups-lpd.plist; \ + $(RMDIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \ else \ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ fi \ @@ -280,5 +291,5 @@ dist: all # -# End of "$Id: Makefile 6500 2007-04-30 21:47:48Z mike $". +# End of "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $". # diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 6444188332..5edcbb4336 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-defaults.m4 6431 2007-04-02 14:31:49Z mike $" +dnl "$Id: cups-defaults.m4 6529 2007-05-08 19:48:20Z mike $" dnl dnl Default cupsd configuration settings for the Common UNIX Printing System dnl (CUPS). @@ -24,11 +24,11 @@ dnl WWW: http://www.cups.org dnl dnl Default langugages... -AC_ARG_WITH(languages, [ --with-languages set installed languages, default="de es et fr he it ja pl sv" ], +AC_ARG_WITH(languages, [ --with-languages set installed languages, default="de es et fr he it ja pl sv zh_TW" ], if test "x$withval" != xno; then LANGUAGES="$withval" fi, - LANGUAGES="de es et fr he it ja pl sv") + LANGUAGES="de es et fr he it ja pl sv zh_TW") AC_SUBST(LANGUAGES) dnl Default ConfigFilePerm @@ -294,5 +294,5 @@ AC_SUBST(CUPS_MAX_COPIES) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES) dnl -dnl End of "$Id: cups-defaults.m4 6431 2007-04-02 14:31:49Z mike $". +dnl End of "$Id: cups-defaults.m4 6529 2007-05-08 19:48:20Z mike $". dnl diff --git a/cups/language.c b/cups/language.c index 21c6ad782b..20e11cd090 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 6489 2007-04-30 17:55:15Z mike $" + * "$Id: language.c 6532 2007-05-09 18:54:23Z mike $" * * I18N/language support for the Common UNIX Printing System (CUPS). * @@ -351,7 +351,7 @@ cupsLangGet(const char *language) /* I - Language or locale */ * preference so we have to look it up this way... */ - if (!language) + if (!language && (language = getenv("LANG")) == NULL) language = appleLangDefault(); #else @@ -1363,5 +1363,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 6489 2007-04-30 17:55:15Z mike $". + * End of "$Id: language.c 6532 2007-05-09 18:54:23Z mike $". */ diff --git a/desktop/cups.desktop b/desktop/cups.desktop index 9664933e70..3657d87f97 100644 --- a/desktop/cups.desktop +++ b/desktop/cups.desktop @@ -29,3 +29,5 @@ Name[it]=Gestione stampa Comment[it]=Interfaccia web di CUPS Name[he]=נהל הדפסות Comment[he]=ממשק דפדפן של CUPS +Name[zh_TW]=印表管理 +Comment[zh_TW]=CUPS 網頁介面 diff --git a/doc/Makefile b/doc/Makefile index 13b99d7ebc..ee2d339734 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,9 +1,9 @@ # -# "$Id: Makefile 6431 2007-04-02 14:31:49Z mike $" +# "$Id: Makefile 6519 2007-05-08 01:55:27Z mike $" # # Documentation makefile for the Common UNIX Printing System (CUPS). # -# Copyright 1997-2006 by Easy Software Products. +# Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the # property of Easy Software Products and are protected by Federal @@ -38,9 +38,11 @@ WEBBUTTONS = \ images/button-accept-jobs.gif \ images/button-add-class.gif \ images/button-add-printer.gif \ + images/button-add-rss-subscription.gif \ images/button-add-this-printer.gif \ images/button-cancel-all-jobs.gif \ images/button-cancel-job.gif \ + images/button-cancel-subscription.gif \ images/button-change-settings.gif \ images/button-clean-print-heads.gif \ images/button-clear.gif \ @@ -51,6 +53,7 @@ WEBBUTTONS = \ images/button-export-samba.gif \ images/button-help.gif \ images/button-hold-job.gif \ + images/button-list-available-printers.gif \ images/button-manage-classes.gif \ images/button-manage-jobs.gif \ images/button-manage-printers.gif \ diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index be45bdd94c..9986991743 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -1512,20 +1512,39 @@ CUPS-Get-PPDs request:
"limit" (integer (1:MAX)): -
The client OPTIONALLY supplies this attribute limiting the number of - PPDs that are returned. +
The client OPTIONALLY supplies this attribute limiting the number of PPDs that are returned.
"ppd-make" (text(127)): -
The client OPTIONALLY supplies a printer manufacturer to select - which PPDs are returned. +
The client OPTIONALLY supplies a printer manufacturer to select which PPDs are returned. + +
"ppd-make-and-model" (text(127)):CUPS 1.3 + +
The client OPTIONALLY supplies a make and model to select which PPDs are returned. + +
"ppd-model-number" (integer):CUPS 1.3 + +
The client OPTIONALLY supplies a model number to select which PPDs are returned. + +
"ppd-natural-language" (naturalLanguage):CUPS 1.3 + +
The client OPTIONALLY supplies a language to select which PPDs are returned. + +
"ppd-product" (text(127)):CUPS 1.3 + +
The client OPTIONALLY supplies a PostScript product string to select which PPDs are returned. + +
"ppd-psversion" (text(127)):CUPS 1.3 + +
The client OPTIONALLY supplies a PostScript version string to select which PPDs are returned. + +
"ppd-type" (type1 keyword):CUPS 1.3 + +
The client OPTIONALLY supplies a driver type to select which PPDs are returned.
"requested-attributes" (1setOf keyword) : -
The client OPTIONALLY supplies a set of attribute names and/or - attribute group names in whose values the requester is interested. If - the client omits this attribute, the server responds as if this - attribute had been supplied with a value of 'all'. +
The client OPTIONALLY supplies a set of attribute names and/or attribute group names in whose values the requester is interested. If the client omits this attribute, the server responds as if this attribute had been supplied with a value of 'all'. Specify "ppd-make" to get a list of manufacturers. @@ -2135,11 +2154,13 @@ name of the PPD file (the NickName attribute in the PPD file). If the make and model is not specified in the PPD file then the ModelName or ShortNickName attributes are used instead. +

ppd-model-number (integer)CUPS 1.3

+ +

The ppd-model-number attribute provides the cupsModelNumber value from the PPD file. +

ppd-name (name(255))

-

The ppd-name attribute specifies the PPD filename on the server -relative to the model directory. The forward slash (/) is used to -delineate directories. +

The ppd-name attribute specifies either the PPD filename on the server relative to the model directory or a URI that maps to a specific driver interface in the driver directory. The forward slash (/) is used to delineate directories.

ppd-natural-language (1setOf naturalLanguage)

@@ -2155,6 +2176,24 @@ language is unknown or undefined then "en" (English) is assumed.

The ppd-product attribute specifies the PSVersion attribute values in the PPD file. +

ppd-type (type1 keyword)CUPS 1.3

+ +

The ppd-type attribute specifies the type of driver described by the PPD file:

+ + +

Printer Attributes

diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index cf02272bc0..46ef775068 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -8,7 +8,7 @@ + + + {refresh_page?:} + + + + + + + + + + + + + + + + + + diff --git a/templates/zh_TW/option-conflict.tmpl b/templates/zh_TW/option-conflict.tmpl new file mode 100644 index 0000000000..70c963b9e8 --- /dev/null +++ b/templates/zh_TW/option-conflict.tmpl @@ -0,0 +1,7 @@ +

錯誤： 下列選項之間發生衝突：

+ + + +

請變更一或多個選項以解決衝突。

diff --git a/templates/zh_TW/option-header.tmpl b/templates/zh_TW/option-header.tmpl new file mode 100644 index 0000000000..cafc9f9fef --- /dev/null +++ b/templates/zh_TW/option-header.tmpl @@ -0,0 +1,3 @@ +

{printer_name}: {group}

+ +

{title}

+ +  é¦–頁   + +   ç®¡ç†   + +   åˆ†é¡ž   + +   æ–‡ä»¶/求助   + +   å·¥ä½œ   + +   å°è¡¨æ©Ÿ   + +
  diff --git a/templates/zh_TW/help-header.tmpl b/templates/zh_TW/help-header.tmpl new file mode 100644 index 0000000000..52a34fac09 --- /dev/null +++ b/templates/zh_TW/help-header.tmpl @@ -0,0 +1,44 @@ +
+{TOPIC?:} + +

搜尋於 +{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:所有文件}}: +清空

+ +
+ + +
+

線上說明文件

+ +

所有文件

+
+ +{[BMTEXT]

{BMTEXT}

+} +
+ +{QUERY?

搜尋結果於 {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:所有文件}}\:

+{QTEXT?:} +:

找不到符合者。

} +
:} +{HELPTITLE?

{HELPTITLE} +檢視可列印版本

:

CUPS 說明頁面

+ +

這是 CUPS 線上說明介面。在上方輸入搜尋字詞 +或是按下任何的文件連結以顯示線上說明資訊。

+ +

如果您剛接觸 CUPS，請參閱 "CUPS 概觀" 頁面。有經驗的使用者 +應該參閱 "CUPS 1.2 有何新功能" 頁面。

+ +

CUPS 首頁 也 +提供許多資源，包括使用者論壇、常見問題的回答， +以及用來提交錯誤報告與功能需求的表格。

} diff --git a/templates/zh_TW/help-printable.tmpl b/templates/zh_TW/help-printable.tmpl new file mode 100644 index 0000000000..305112a337 --- /dev/null +++ b/templates/zh_TW/help-printable.tmpl @@ -0,0 +1,11 @@ + + + + + {HELPTITLE} + + + + + +

{HELPTITLE}

diff --git a/templates/zh_TW/job-cancel.tmpl b/templates/zh_TW/job-cancel.tmpl new file mode 100644 index 0000000000..d60b15ebde --- /dev/null +++ b/templates/zh_TW/job-cancel.tmpl @@ -0,0 +1 @@ +

工作 {job_id} 已經取消。 diff --git a/templates/zh_TW/job-hold.tmpl b/templates/zh_TW/job-hold.tmpl new file mode 100644 index 0000000000..1a53db43a9 --- /dev/null +++ b/templates/zh_TW/job-hold.tmpl @@ -0,0 +1 @@ +

工作 {job_id} 已經延遲列印。 diff --git a/templates/zh_TW/job-move.tmpl b/templates/zh_TW/job-move.tmpl new file mode 100644 index 0000000000..67fbedcfde --- /dev/null +++ b/templates/zh_TW/job-move.tmpl @@ -0,0 +1,22 @@ +

+ +{job_id?:} + +

{job_id?移動工作 {job_id}:移動所有工作}

+ + + + + + + + + + +
新目的地： + +
+ +
diff --git a/templates/zh_TW/job-moved.tmpl b/templates/zh_TW/job-moved.tmpl new file mode 100644 index 0000000000..b66712cdbc --- /dev/null +++ b/templates/zh_TW/job-moved.tmpl @@ -0,0 +1,2 @@ +

{job_id?工作 {job_id}:所有工作} 移動至 +{job_printer_name}。

diff --git a/templates/zh_TW/job-release.tmpl b/templates/zh_TW/job-release.tmpl new file mode 100644 index 0000000000..85654464ad --- /dev/null +++ b/templates/zh_TW/job-release.tmpl @@ -0,0 +1 @@ +

工作 {job_id} 已經釋出至列印。 diff --git a/templates/zh_TW/job-restart.tmpl b/templates/zh_TW/job-restart.tmpl new file mode 100644 index 0000000000..168f533f4f --- /dev/null +++ b/templates/zh_TW/job-restart.tmpl @@ -0,0 +1 @@ +

工作 {job_id} 已經重新啟動。 diff --git a/templates/zh_TW/jobs-header.tmpl b/templates/zh_TW/jobs-header.tmpl new file mode 100644 index 0000000000..52117c4b7f --- /dev/null +++ b/templates/zh_TW/jobs-header.tmpl @@ -0,0 +1,15 @@ +

{?which_jobs=?顯示已完成工作 +顯示所有工作:{which_jobs=all?顯示已完成工作 +顯示進行中工作:顯示進行中工作 +顯示所有工作}}

+ +

{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.

diff --git a/templates/zh_TW/jobs.tmpl b/templates/zh_TW/jobs.tmpl new file mode 100644 index 0000000000..8b17a02d9b --- /dev/null +++ b/templates/zh_TW/jobs.tmpl @@ -0,0 +1,42 @@ +{#job_id=0?: + + + + + + + + + + + +{[job_id] + + + + + + + + + +} +
ID åç¨± ä½¿ç”¨è€… å¤§å° é æ•¸ ç‹€æ…‹ æŽ§åˆ¶ 
{job_printer_name}-{job_id} {?job_name=?不明:{job_name}} {job_originating_user_name} {job_k_octets}k {job_media_sheets_completed=0?不明:{?job_media_sheets_completed}} {job_state=3?擱置自
{time_at_creation}:{job_state=4?延遲自
{time_at_creation}: +{job_state=5?處理自
{time_at_processing}:{job_state=6?停止: +{job_state=7?取消於
{time_at_completed}:{job_state=8?中斷:完成於
{time_at_completed}}}}}}} 		 +{job_preserved>0? + +重新列印工作:} +{job_state=4? + +釋出工作:} +{job_state=3? + +延遲工作:} +{job_state<7? + +取消工作 +移動工作:} + 
+} diff --git a/templates/zh_TW/maintenance.tmpl b/templates/zh_TW/maintenance.tmpl new file mode 100644 index 0000000000..2e7532ce6b --- /dev/null +++ b/templates/zh_TW/maintenance.tmpl @@ -0,0 +1,2 @@ +

送出維護命令；工作 ID 為 +{printer_name}-{job_id}。

diff --git a/templates/zh_TW/modify-class.tmpl b/templates/zh_TW/modify-class.tmpl new file mode 100644 index 0000000000..3fbaeef6fe --- /dev/null +++ b/templates/zh_TW/modify-class.tmpl @@ -0,0 +1,34 @@ +
+ + +

修改分類 {printer_name}

+ + + + + + + + + + + + + + + + + + + + + + +
名稱： +{printer_name}
位置：
描述：
成員： + +
+ +
diff --git a/templates/zh_TW/modify-printer.tmpl b/templates/zh_TW/modify-printer.tmpl new file mode 100644 index 0000000000..10f33f5eed --- /dev/null +++ b/templates/zh_TW/modify-printer.tmpl @@ -0,0 +1,29 @@ +
+ +{?device_uri=?:} +{?printer_make_and_model=?:} + +

修改印表機 {printer_name}

+ + + + + + + + + + + + + + + + + + +
名稱：{printer_name}
位置：
+(容易理解的位置，像是 "實驗室一")
描述：
+(容易理解的描述，像是 "HP LaserJet with Duplexer")
+ +
diff --git a/templates/zh_TW/option-boolean.tmpl b/templates/zh_TW/option-boolean.tmpl new file mode 100644 index 0000000000..72c85189a4 --- /dev/null +++ b/templates/zh_TW/option-boolean.tmpl @@ -0,0 +1,6 @@ +
{keytext}: +{[choices]{text}} +
diff --git a/templates/zh_TW/option-pickmany.tmpl b/templates/zh_TW/option-pickmany.tmpl new file mode 100644 index 0000000000..d2534af75a --- /dev/null +++ b/templates/zh_TW/option-pickmany.tmpl @@ -0,0 +1,6 @@ + + + + diff --git a/templates/zh_TW/option-pickone.tmpl b/templates/zh_TW/option-pickone.tmpl new file mode 100644 index 0000000000..08342d06e4 --- /dev/null +++ b/templates/zh_TW/option-pickone.tmpl @@ -0,0 +1,6 @@ + + + + diff --git a/templates/zh_TW/option-trailer.tmpl b/templates/zh_TW/option-trailer.tmpl new file mode 100644 index 0000000000..bee811cb03 --- /dev/null +++ b/templates/zh_TW/option-trailer.tmpl @@ -0,0 +1,5 @@ + + + + +
{keytext}:
{keytext}:
diff --git a/templates/zh_TW/pager.tmpl b/templates/zh_TW/pager.tmpl new file mode 100644 index 0000000000..1248fbd0ec --- /dev/null +++ b/templates/zh_TW/pager.tmpl @@ -0,0 +1,7 @@ + + + + + + +
{PREVURL?顯示上一個: }{ORDER=dec?遞增排序:遞減排序}{NEXTURL?顯示下一個: }
diff --git a/templates/zh_TW/printer-accept.tmpl b/templates/zh_TW/printer-accept.tmpl new file mode 100644 index 0000000000..65a73c4f69 --- /dev/null +++ b/templates/zh_TW/printer-accept.tmpl @@ -0,0 +1,3 @@ +

{is_class?分類:印表機} {printer_name} +現在準備接受工作。

diff --git a/templates/zh_TW/printer-added.tmpl b/templates/zh_TW/printer-added.tmpl new file mode 100644 index 0000000000..b81b1f7143 --- /dev/null +++ b/templates/zh_TW/printer-added.tmpl @@ -0,0 +1,2 @@ +

印表機 {printer_name} 已經成功 +加入。 diff --git a/templates/zh_TW/printer-configured.tmpl b/templates/zh_TW/printer-configured.tmpl new file mode 100644 index 0000000000..5a30980a90 --- /dev/null +++ b/templates/zh_TW/printer-configured.tmpl @@ -0,0 +1,2 @@ +

印表機 {printer_name} 已經 +成功配置。 diff --git a/templates/zh_TW/printer-confirm.tmpl b/templates/zh_TW/printer-confirm.tmpl new file mode 100644 index 0000000000..e6b0a98d05 --- /dev/null +++ b/templates/zh_TW/printer-confirm.tmpl @@ -0,0 +1,6 @@ +

警告: 您確定要刪除印表機 {printer_name} 嗎？

+ +

刪除印表機

diff --git a/templates/zh_TW/printer-default.tmpl b/templates/zh_TW/printer-default.tmpl new file mode 100644 index 0000000000..7c26e78bf1 --- /dev/null +++ b/templates/zh_TW/printer-default.tmpl @@ -0,0 +1,6 @@ +

{is_class?分類:印表機} {printer_name} +已被設為伺服器上的預設印表機。

+ +
注意: 任何經由 lpoptions 命令所設定的使用者預設值， +將會蓋過此一設定值。
diff --git a/templates/zh_TW/printer-deleted.tmpl b/templates/zh_TW/printer-deleted.tmpl new file mode 100644 index 0000000000..00ad550ae9 --- /dev/null +++ b/templates/zh_TW/printer-deleted.tmpl @@ -0,0 +1 @@ +

印表機 {printer_name} 已經成功刪除。 diff --git a/templates/zh_TW/printer-jobs-header.tmpl b/templates/zh_TW/printer-jobs-header.tmpl new file mode 100644 index 0000000000..6a6be7d5f3 --- /dev/null +++ b/templates/zh_TW/printer-jobs-header.tmpl @@ -0,0 +1 @@ +

工作

diff --git a/templates/zh_TW/printer-modified.tmpl b/templates/zh_TW/printer-modified.tmpl new file mode 100644 index 0000000000..43a72f6ecd --- /dev/null +++ b/templates/zh_TW/printer-modified.tmpl @@ -0,0 +1,2 @@ +

印表機 {printer_name} 已經成功 +修改。 diff --git a/templates/zh_TW/printer-purge.tmpl b/templates/zh_TW/printer-purge.tmpl new file mode 100644 index 0000000000..e3d09487d7 --- /dev/null +++ b/templates/zh_TW/printer-purge.tmpl @@ -0,0 +1,3 @@ +

{is_class?分類:印表機} {printer_name} +的所有工作都已被清除。

diff --git a/templates/zh_TW/printer-reject.tmpl b/templates/zh_TW/printer-reject.tmpl new file mode 100644 index 0000000000..3035a0023e --- /dev/null +++ b/templates/zh_TW/printer-reject.tmpl @@ -0,0 +1,3 @@ +

{is_class?分類:印表機} {printer_name} +已不再接受工作。

diff --git a/templates/zh_TW/printer-start.tmpl b/templates/zh_TW/printer-start.tmpl new file mode 100644 index 0000000000..d66c8c973b --- /dev/null +++ b/templates/zh_TW/printer-start.tmpl @@ -0,0 +1,3 @@ +

{is_class?分類:印表機} {printer_name} +已經啟動。

diff --git a/templates/zh_TW/printer-stop.tmpl b/templates/zh_TW/printer-stop.tmpl new file mode 100644 index 0000000000..6df0fa88d9 --- /dev/null +++ b/templates/zh_TW/printer-stop.tmpl @@ -0,0 +1,3 @@ +

{is_class?Class:Printer} {printer_name} +已經停止。

diff --git a/templates/zh_TW/printers-header.tmpl b/templates/zh_TW/printers-header.tmpl new file mode 100644 index 0000000000..4ec355f025 --- /dev/null +++ b/templates/zh_TW/printers-header.tmpl @@ -0,0 +1 @@ +

{total=0?沒有任何印表機:顯示 {total} 台印表機中的 {#printer_name}}。

diff --git a/templates/zh_TW/printers.tmpl b/templates/zh_TW/printers.tmpl new file mode 100644 index 0000000000..24f6ad7e46 --- /dev/null +++ b/templates/zh_TW/printers.tmpl @@ -0,0 +1,64 @@ +{printer_type?:}{#printer_name=0?: +{[printer_name] +

{printer_name}{default_name={printer_name}? (Default Printer):} +{?printer_state_message=?:"{printer_state_message}"}

+ + + + + + +
+ +描述： {printer_info}
+位置： {printer_location}
+型號： {printer_make_and_model}
+狀態： {printer_state=3?閒置:{printer_state=4?處理中:已停止}}, +{printer_is_accepting_jobs=0?正在拒絕工作:正在接受工作}, {printer_is_shared=0?未:} 公開。 +{?device_uri=?:
裝置 URI: {device_uri}} + +

+ +印表測試頁 +{?cupscommand=1? +清理列印頭 + +列印自我測試頁:} +{printer_state=5? + +啟動印表機 +: + +停止印表機 +} +{printer_is_accepting_jobs=0? + +接受工作 +: + +拒絕工作 +} + +移動所有工作 + +取消所有工作 +{printer_is_shared=0? + +公開印表機 +: + +不公開印表機 +} + +修改印表機 + +設定印表機選項 + +刪除印表機 + +設為預設印表機 + +設定允許的使用者 +

+
+}} diff --git a/templates/zh_TW/restart.tmpl b/templates/zh_TW/restart.tmpl new file mode 100644 index 0000000000..06a35abf80 --- /dev/null +++ b/templates/zh_TW/restart.tmpl @@ -0,0 +1 @@ +

請稍待，伺服器重新啟動中…

diff --git a/templates/zh_TW/samba-export.tmpl b/templates/zh_TW/samba-export.tmpl new file mode 100644 index 0000000000..4e08162a82 --- /dev/null +++ b/templates/zh_TW/samba-export.tmpl @@ -0,0 +1,54 @@ + + +
+ + +

匯出印表機至 Samba

+ +{error?

無法匯出印表機至 Samba\:

+
{error}
+

參閱 error_log 檔案以獲得更多資訊。

: +

此頁允許您匯出印表機至 Samba，以便 +Windows 客戶端可以經由他們桌面上的 Network +Neighborhood 或 Network Places 圖示 +來存取它們。之前您必須安裝 Windows PostScript +印表機驅動程式，描述請見 cupsaddsmb(8) 說明頁面。

} + + + + + + + + + + + + + + + + + + +
印表機： +
+ 匯出所有印表機 +
Samba 使用者名稱： (必要)
Samba 密碼： (必要)
+ +
diff --git a/templates/zh_TW/samba-exported.tmpl b/templates/zh_TW/samba-exported.tmpl new file mode 100644 index 0000000000..63843c6ca4 --- /dev/null +++ b/templates/zh_TW/samba-exported.tmpl @@ -0,0 +1 @@ +

印表機成功匯出至 samba。

diff --git a/templates/zh_TW/search.tmpl b/templates/zh_TW/search.tmpl new file mode 100644 index 0000000000..5389353037 --- /dev/null +++ b/templates/zh_TW/search.tmpl @@ -0,0 +1,13 @@ +
+{WHICH_JOBS?:} +{ORDER?:} + +

搜尋於 +{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?分類:{SECTION=jobs?工作:印表機}}}: + +Clear

+ +
diff --git a/templates/zh_TW/set-printer-options-header.tmpl b/templates/zh_TW/set-printer-options-header.tmpl new file mode 100644 index 0000000000..864f9f0ced --- /dev/null +++ b/templates/zh_TW/set-printer-options-header.tmpl @@ -0,0 +1,3 @@ +
+ + diff --git a/templates/zh_TW/set-printer-options-trailer.tmpl b/templates/zh_TW/set-printer-options-trailer.tmpl new file mode 100644 index 0000000000..a3d1e1ffaa --- /dev/null +++ b/templates/zh_TW/set-printer-options-trailer.tmpl @@ -0,0 +1 @@ +
diff --git a/templates/zh_TW/test-page.tmpl b/templates/zh_TW/test-page.tmpl new file mode 100644 index 0000000000..a134695fc7 --- /dev/null +++ b/templates/zh_TW/test-page.tmpl @@ -0,0 +1,2 @@ +

已送出測試頁；工作 ID 為 +{printer_name}-{job_id}。

diff --git a/templates/zh_TW/trailer.tmpl b/templates/zh_TW/trailer.tmpl new file mode 100644 index 0000000000..3346804f9a --- /dev/null +++ b/templates/zh_TW/trailer.tmpl @@ -0,0 +1,21 @@ + +  + + + + + +

Common UNIX Printing System、CUPS 以及 CUPS 圖標都是 +Easy Software Products +的商標財產。CUPS 是 1997-2007 由 Easy Software Products 版權所有， +保留一切權利。

+ + + + + + + + diff --git a/templates/zh_TW/users.tmpl b/templates/zh_TW/users.tmpl new file mode 100644 index 0000000000..51622fc016 --- /dev/null +++ b/templates/zh_TW/users.tmpl @@ -0,0 +1,26 @@ +
+ + +{IS_CLASS?:} + +

{printer_name} 所允許的使用者

+ + + + + + + + + + +
使用者： + +
+允許這些使用者列印 +拒絕這些使用者列印 +
+ +
+ +
diff --git a/tools/makebuttons b/tools/makebuttons index a6f5b41afa..b31700bfe3 100755 --- a/tools/makebuttons +++ b/tools/makebuttons @@ -34,7 +34,7 @@ # # Usage: # -# tools/makebuttons locale buttons.txt +# tools/makebuttons [--font filename] locale buttons.txt # # "Locale" is the locale name, either "ll" or "ll_CC" where "ll" is the # 2-letter language abbreviation and "CC" is the 2-letter ISO country @@ -59,8 +59,25 @@ # "tools/buttons.txt" for inspiration... # +# Bitstream Vera font... +font="fonts/Vera.ttf" + +# Colors +background="#d4d4a4" +black="#000000" +green="#009900" +red="#cc0000" +standard="#666633" + + +if test "x$1" == x--font; then + shift + font="$1" + shift +fi + if test $# -lt 2; then - echo Usage: tools/makebuttons locale buttons.txt + echo Usage: tools/makebuttons "[--font filename]" locale buttons.txt exit 1 elif test ! -d tools; then echo ERROR: You MUST run the makebuttons script from the main CUPS source directory! @@ -82,17 +99,6 @@ elif test ! -r $list; then fi -# Bitstream Vera font... -font="fonts/Vera.ttf" - -# Colors -background="#d4d4a4" -black="#000000" -green="#009900" -red="#cc0000" -standard="#666633" - - # 'generate_button()' - Create a button image. # # Arg 1: button filename (WITH .gif extension!) @@ -168,7 +174,7 @@ function generate_button() txt_h=`identify -format "%h" $tmp_btn` txt_w=`identify -format "%w" $tmp_btn` - if test $txt_h -gt 32; then + if test $txt_h -gt 40; then echo "ERROR: 2 lines maximum for the button text" exit 1 fi diff --git a/tools/testosx b/tools/testosx index 92cc030635..8f0be27101 100755 --- a/tools/testosx +++ b/tools/testosx @@ -34,26 +34,36 @@ sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \ $pkgdir/Resources/Welcome.rtf cp packaging/installer.tif $pkgdir/Resources/background.tif -cat >$pkgdir/Resources/preflight <$pkgdir/Resources/preflight <$pkgdir/Resources/preflight <$pkgdir/Resources/postflight <$pkgdir/Resources/postflight <