From 972ff65857f91574e08fb4877b9e635199778c16 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 10 Feb 2009 17:32:44 +0000 Subject: [PATCH] - Updated from git: - Handle D-Bus failures when querying Jockey (bug #484402). - Set operation when fetching PPD from server (bug #484130). - Don't allow prompting when updating the UI for a server failure (bug #484130). - Fixed printing a test page from the applet (bug #484130). --- system-config-printer-git-1.1.x.patch | 1446 ++++++++++++++++++++++++- system-config-printer.spec | 10 +- 2 files changed, 1444 insertions(+), 12 deletions(-) diff --git a/system-config-printer-git-1.1.x.patch b/system-config-printer-git-1.1.x.patch index 8f5c795..47c1105 100644 --- a/system-config-printer-git-1.1.x.patch +++ b/system-config-printer-git-1.1.x.patch @@ -1,6 +1,6 @@ diff -up system-config-printer-1.1.3/authconn.py.git-1.1.x system-config-printer-1.1.3/authconn.py --- system-config-printer-1.1.3/authconn.py.git-1.1.x 2009-02-02 17:49:39.000000000 +0000 -+++ system-config-printer-1.1.3/authconn.py 2009-02-05 10:52:40.000000000 +0000 ++++ system-config-printer-1.1.3/authconn.py 2009-02-10 16:54:17.000000000 +0000 @@ -19,8 +19,10 @@ import threading @@ -59,8 +59,14 @@ diff -up system-config-printer-1.1.3/authconn.py.git-1.1.x system-config-printer self._failed (e == cups.IPP_FORBIDDEN) diff -U0 system-config-printer-1.1.3/ChangeLog.git-1.1.x system-config-printer-1.1.3/ChangeLog --- system-config-printer-1.1.3/ChangeLog.git-1.1.x 2009-02-02 17:49:39.000000000 +0000 -+++ system-config-printer-1.1.3/ChangeLog 2009-02-05 10:52:40.000000000 +0000 -@@ -0,0 +1,13 @@ ++++ system-config-printer-1.1.3/ChangeLog 2009-02-10 16:54:17.000000000 +0000 +@@ -0,0 +1,19 @@ ++2009-02-10 Tim Waugh ++ ++ * system-config-printer.py (NewPrinterGUI.getJockeyDriver_thread): ++ Handle D-Bus failures when connecting to the session bus (bug ++ #484402). ++ +2009-02-04 Tim Waugh + + * jobviewer.py (JobViewer.set_statusicon_visibility): Fixed typo. @@ -75,8 +81,8 @@ diff -U0 system-config-printer-1.1.3/ChangeLog.git-1.1.x system-config-printer-1 + display status icon for completed jobs (trac #140). + diff -up /dev/null system-config-printer-1.1.3/cupspk.py ---- /dev/null 2009-02-05 08:56:23.492001950 +0000 -+++ system-config-printer-1.1.3/cupspk.py 2009-02-05 10:52:40.000000000 +0000 +--- /dev/null 2009-02-10 09:39:07.061189340 +0000 ++++ system-config-printer-1.1.3/cupspk.py 2009-02-10 16:54:17.000000000 +0000 @@ -0,0 +1,732 @@ +# vim: set ts=4 sw=4 et: coding=UTF-8 +# @@ -812,7 +818,7 @@ diff -up /dev/null system-config-printer-1.1.3/cupspk.py +# printFiles diff -up system-config-printer-1.1.3/jobviewer.py.git-1.1.x system-config-printer-1.1.3/jobviewer.py --- system-config-printer-1.1.3/jobviewer.py.git-1.1.x 2009-02-03 12:30:29.000000000 +0000 -+++ system-config-printer-1.1.3/jobviewer.py 2009-02-05 10:52:40.000000000 +0000 ++++ system-config-printer-1.1.3/jobviewer.py 2009-02-10 16:54:17.000000000 +0000 @@ -1,5 +1,4 @@ - @@ -857,7 +863,7 @@ diff -up system-config-printer-1.1.3/jobviewer.py.git-1.1.x system-config-printe jobdata = self.jobs[jobid] diff -up system-config-printer-1.1.3/Makefile.am.git-1.1.x system-config-printer-1.1.3/Makefile.am --- system-config-printer-1.1.3/Makefile.am.git-1.1.x 2009-02-02 17:49:39.000000000 +0000 -+++ system-config-printer-1.1.3/Makefile.am 2009-02-05 10:52:40.000000000 +0000 ++++ system-config-printer-1.1.3/Makefile.am 2009-02-10 16:54:17.000000000 +0000 @@ -68,6 +68,7 @@ nobase_pkgdata_DATA= \ AdvancedServerSettings.py \ authconn.py \ @@ -868,7 +874,7 @@ diff -up system-config-printer-1.1.3/Makefile.am.git-1.1.x system-config-printer HIG.py \ diff -up system-config-printer-1.1.3/po/fi.po.git-1.1.x system-config-printer-1.1.3/po/fi.po --- system-config-printer-1.1.3/po/fi.po.git-1.1.x 2009-02-03 12:33:33.000000000 +0000 -+++ system-config-printer-1.1.3/po/fi.po 2009-02-05 10:52:40.000000000 +0000 ++++ system-config-printer-1.1.3/po/fi.po 2009-02-10 16:54:17.000000000 +0000 @@ -3,59 +3,58 @@ # # Mikko Ikola , 2004. @@ -3720,7 +3726,7 @@ diff -up system-config-printer-1.1.3/po/fi.po.git-1.1.x system-config-printer-1. #~ msgstr "Luo uusi tulostinryhmä" diff -up system-config-printer-1.1.3/po/ko.po.git-1.1.x system-config-printer-1.1.3/po/ko.po --- system-config-printer-1.1.3/po/ko.po.git-1.1.x 2009-02-03 12:33:33.000000000 +0000 -+++ system-config-printer-1.1.3/po/ko.po 2009-02-05 10:52:40.000000000 +0000 ++++ system-config-printer-1.1.3/po/ko.po 2009-02-10 16:54:17.000000000 +0000 @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: system-config-printer.1.1.x\n" @@ -4360,10 +4366,1368 @@ diff -up system-config-printer-1.1.3/po/ko.po.git-1.1.x system-config-printer-1. - -#~ msgid "Printer status" -#~ msgstr "프린터 상태" +diff -up system-config-printer-1.1.3/po/sk.po.git-1.1.x system-config-printer-1.1.3/po/sk.po +--- system-config-printer-1.1.3/po/sk.po.git-1.1.x 2009-02-03 12:33:33.000000000 +0000 ++++ system-config-printer-1.1.3/po/sk.po 2009-02-10 16:54:17.000000000 +0000 +@@ -5,20 +5,20 @@ + # + # Mike Karas , 2005. + # Lubomir Kundrak , 2007. +-# Ondrej Šulek , 2008. ++# Ondrej Šulek , 2008, 2009. + msgid "" + msgstr "" + "Project-Id-Version: system-config-printer\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" +-"POT-Creation-Date: 2009-02-03 12:31+0000\n" +-"PO-Revision-Date: 2008-10-08 10:11+0200\n" ++"POT-Creation-Date: 2009-02-03 13:18+0000\n" ++"PO-Revision-Date: 2009-02-10 15:51+0100\n" + "Last-Translator: Ondrej Šulek \n" + "Language-Team: Slovak \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +-"X-Generator: Lokalize 0.2\n" ++"X-Generator: Lokalize 0.3\n" + + #: ../AdvancedServerSettings.py:41 + msgid "Advanced Server Settings" +@@ -74,17 +74,15 @@ msgstr "Overenie" + + #: ../authconn.py:83 + msgid "Remember password" +-msgstr "" ++msgstr "Zapamätať heslo" + + #: ../authconn.py:213 +-#, fuzzy + msgid "Operation canceled" +-msgstr "Operačné pravidlo:" ++msgstr "Operácia zrušená" + +-#: ../authconn.py:234 +-#, fuzzy, python-format ++#: ../authconn.py:234, python-format + msgid "CUPS server error (%s)" +-msgstr "Chyba CUPS servera" ++msgstr "Chyba CUPS servera (%s)" + + #: ../authconn.py:236 ../errordialogs.py:57 + #: ../troubleshoot/PrintTestPage.py:400 +@@ -93,9 +91,8 @@ msgid "There was an error during the CUP + msgstr "Došlo k chybe počas vykonávania akcie CUPS: '%s'." + + #: ../authconn.py:239 +-#, fuzzy + msgid "Retry" +-msgstr "moje úlohy" ++msgstr "Opakovať" + + #: ../authconn.py:360 ../authconn.py:362 ../errordialogs.py:65 ../pysmb.py:75 + #: ../pysmb.py:77 +@@ -214,9 +211,8 @@ msgid "Re_print" + msgstr "Znova _vytlač" + + #: ../jobviewer.py:174 +-#, fuzzy + msgid "_Authenticate" +-msgstr "Overenie" ++msgstr "_Overenie" + + #: ../jobviewer.py:212 ../troubleshoot/PrintTestPage.py:82 + msgid "Job" +@@ -290,9 +286,8 @@ msgid "%d minutes ago" + msgstr "Pred %d minútami" + + #: ../jobviewer.py:403 +-#, fuzzy + msgid "an hour ago" +-msgstr "Pred hodinou" ++msgstr "pred hodinou" + + #: ../jobviewer.py:405 + #, python-format +@@ -301,21 +296,19 @@ msgstr "Pred %d hodinami" + + #: ../jobviewer.py:409 + msgid "yesterday" +-msgstr "" ++msgstr "včera" + +-#: ../jobviewer.py:411 +-#, fuzzy, python-format ++#: ../jobviewer.py:411, python-format + msgid "%d days ago" +-msgstr "Pred %d hodinami" ++msgstr "Pred %d dňami" + + #: ../jobviewer.py:415 + msgid "last week" +-msgstr "" ++msgstr "minulý týždeň" + +-#: ../jobviewer.py:417 +-#, fuzzy, python-format ++#: ../jobviewer.py:417, python-format + msgid "%d weeks ago" +-msgstr "Pred %d minútami" ++msgstr "Pred %d týždňami" + + #: ../jobviewer.py:548 + msgid "Held for authentication" +@@ -325,37 +318,33 @@ msgstr "Pozdržaný pre overenie" + msgid "Held" + msgstr "Pozdržaný" + +-#: ../jobviewer.py:577 +-#, fuzzy, python-format ++#: ../jobviewer.py:577, python-format + msgid "Held until %s" +-msgstr "Podržať do:" ++msgstr "Pozdržať do %s" + + #: ../jobviewer.py:581 +-#, fuzzy + msgid "Held until day-time" +-msgstr "Podržať do:" ++msgstr "Pozdržať do rána" + + #: ../jobviewer.py:583 +-#, fuzzy + msgid "Held until evening" +-msgstr "Podržať do:" ++msgstr "Pozdržať do večera" + + #: ../jobviewer.py:585 + msgid "Held until night-time" +-msgstr "" ++msgstr "Pozdržať do noci" + + #: ../jobviewer.py:587 + msgid "Held until second shift" +-msgstr "" ++msgstr "Pozdržať do druhej zmeny" + + #: ../jobviewer.py:589 + msgid "Held until third shift" +-msgstr "" ++msgstr "Pozdržať do tretej zmeny" + + #: ../jobviewer.py:591 +-#, fuzzy + msgid "Held until weekend" +-msgstr "Podržať do:" ++msgstr "Pozdržať do víkendu" + + #: ../jobviewer.py:594 ../troubleshoot/PrintTestPage.py:41 + msgid "Pending" +@@ -384,9 +373,8 @@ msgid "Completed" + msgstr "Dokončené" + + #: ../jobviewer.py:673 ../jobviewer.py:792 +-#, fuzzy + msgid "authenticating job" +-msgstr "Overenie" ++msgstr "overovanie " + + #: ../jobviewer.py:688 + msgid "Authentication Required" +@@ -438,21 +426,19 @@ msgstr "1 dokument vo fronte" + msgid "%d documents queued" + msgstr "%d dokumentov vo fronte" + +-#: ../jobviewer.py:1234 +-#, fuzzy, python-format ++#: ../jobviewer.py:1234, python-format + msgid "Job %d completed" +-msgstr "Dokončené" ++msgstr "Úloha %d dokončená" + + #: ../jobviewer.py:1235 + #, python-format + msgid "Document `%s' has finished printing on `%s'." +-msgstr "" ++msgstr "Dokument `%s' skončil tlač na `%s'." + + #: ../jobviewer.py:1383 + #, python-format + msgid "There was a problem sending document `%s' (job %d) to the printer." +-msgstr "" +-"Pri odosielaní dokumentu `%s' (úloha %d) na tlačiareň sa vyskytol problém." ++msgstr "Pri odosielaní dokumentu `%s' (úloha %d) na tlačiareň sa vyskytol problém." + + #: ../jobviewer.py:1386 + #, python-format +@@ -501,249 +487,237 @@ msgid "Conflicts with:" + msgstr "Konflikt s:" + + #: ../ppdippstr.py:37 +-#, fuzzy + msgid "Abort job" +-msgstr "Prerušené" ++msgstr "Prerušiť úlohu" + + #: ../ppdippstr.py:38 +-#, fuzzy + msgid "Retry job" +-msgstr "moje úlohy" ++msgstr "Opakovať úlohu" + + #: ../ppdippstr.py:39 +-#, fuzzy + msgid "Stop printer" +-msgstr "Kopírovať tlačiareň" ++msgstr "Zastaviť tlačiareň" + + #: ../ppdippstr.py:44 +-#, fuzzy + msgid "Default behavior" +-msgstr "Predvolená tlačiareň" ++msgstr "Predvolené správanie" + + #: ../ppdippstr.py:45 +-#, fuzzy + msgid "Authenticated" +-msgstr "Overenie" ++msgstr "Overené" + + #: ../ppdippstr.py:50 ../system-config-printer.py:5839 + msgid "None" + msgstr "Žiadny" + + #: ../ppdippstr.py:51 +-#, fuzzy + msgid "Classified" +-msgstr "Trieda" ++msgstr "Klasifikované" + + #: ../ppdippstr.py:52 + msgid "Confidential" +-msgstr "" ++msgstr "Dôverné" + + #: ../ppdippstr.py:53 +-#, fuzzy + msgid "Secret" +-msgstr "_Server" ++msgstr "Tajné" + + #: ../ppdippstr.py:54 + msgid "Standard" +-msgstr "" ++msgstr "Štandardné" + + #: ../ppdippstr.py:55 + msgid "Top secret" +-msgstr "" ++msgstr "Prísne tajné" + + #: ../ppdippstr.py:56 + msgid "Unclassified" +-msgstr "" ++msgstr "Neklasifikovaný" + + #: ../ppdippstr.py:65 +-#, fuzzy + msgid "General" +-msgstr "Sériové číslo" ++msgstr "Všeobecné" + + #. HPIJS options + #: ../ppdippstr.py:68 +-#, fuzzy + msgid "Printout mode" +-msgstr "Model tlačiarne:" ++msgstr "Mód tlače" + + #: ../ppdippstr.py:69 + msgid "Draft (auto-detect-paper type)" +-msgstr "" ++msgstr "Návrh (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:71 + msgid "Draft grayscale (auto-detect-paper type)" +-msgstr "" ++msgstr "Návrh v odtieňoch šedej (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:72 + msgid "Normal (auto-detect-paper type)" +-msgstr "" ++msgstr "Normálne (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:74 + msgid "Normal grayscale (auto-detect-paper type)" +-msgstr "" ++msgstr "Normálne odtiene šedej (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:76 + msgid "High quality (auto-detect-paper type)" +-msgstr "" ++msgstr "Vysoká kvalita (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:78 + msgid "High quality grayscale (auto-detect-paper type)" +-msgstr "" ++msgstr "Vysoko kvalitné odtiene šedej (automaticky určiť typ papiera)" + + #: ../ppdippstr.py:79 + msgid "Photo (on photo paper)" +-msgstr "" ++msgstr "Foto kvalita (na foto papier)" + + #: ../ppdippstr.py:81 + msgid "Best quality (color on photo paper)" +-msgstr "" ++msgstr "Najlepšia kvalita (farebne na foto papier)" + + #: ../ppdippstr.py:83 + msgid "Normal quality (color on photo paper)" +-msgstr "" ++msgstr "Normálna kvalita (farebne na foto papier)" + + #: ../ppdippstr.py:85 + msgid "Media source" +-msgstr "" ++msgstr "Zdroj papiera" + + #: ../ppdippstr.py:86 +-#, fuzzy + msgid "Printer default" +-msgstr "Model tlačiarne:" ++msgstr "Preddefinované tlačiarňou" + + #: ../ppdippstr.py:87 + msgid "Photo tray" +-msgstr "" ++msgstr "Foto zásobník" + + #: ../ppdippstr.py:88 + msgid "Upper tray" +-msgstr "" ++msgstr "Horný zásobník" + + #: ../ppdippstr.py:89 + msgid "Lower tray" +-msgstr "" ++msgstr "Dolný zásobník" + + #: ../ppdippstr.py:90 + msgid "CD or DVD tray" +-msgstr "" ++msgstr "CD alebo DVD zásobník" + + #: ../ppdippstr.py:91 + msgid "Envelope feeder" +-msgstr "" ++msgstr "Podávač obálok" + + #: ../ppdippstr.py:92 + msgid "Large capacity tray" +-msgstr "" ++msgstr "Veľkokapacitný zásobník" + + #: ../ppdippstr.py:93 + msgid "Manual feeder" +-msgstr "" ++msgstr "Ručné podávanie" + + #: ../ppdippstr.py:94 + msgid "Multi-purpose tray" +-msgstr "" ++msgstr "Multifunkčný zásobník" + + #: ../ppdippstr.py:96 +-#, fuzzy + msgid "Page size" +-msgstr "Stránok na list:" ++msgstr "Veľkosť stránky" + + #: ../ppdippstr.py:97 + msgid "Custom" +-msgstr "" ++msgstr "Vlastné" + + #: ../ppdippstr.py:98 + msgid "Photo or 4x6 inch index card" +-msgstr "" ++msgstr "Fotka alebo 4x6 palcová karta indexu" + + #: ../ppdippstr.py:99 + msgid "Photo or 5x7 inch index card" +-msgstr "" ++msgstr "Fotka alebo 5x7 palcová karta indexu" + + #: ../ppdippstr.py:100 + msgid "Photo with tear-off tab" +-msgstr "" ++msgstr "Fotka s odtrhávacou časťou" + + #: ../ppdippstr.py:101 + msgid "3x5 inch index card" +-msgstr "" ++msgstr "3x5 palcová karta indexu" + + #: ../ppdippstr.py:102 + msgid "5x8 inch index card" +-msgstr "" ++msgstr "5x8 palcová karta indexu" + + #: ../ppdippstr.py:103 + msgid "A6 with tear-off tab" +-msgstr "" ++msgstr "A6 s odtrhávacou časťou" + + #: ../ppdippstr.py:104 + msgid "CD or DVD 80mm" +-msgstr "" ++msgstr "CD alebo DVD 80mm" + + #: ../ppdippstr.py:105 + msgid "CD or DVD 120mm" +-msgstr "" ++msgstr "CD alebo DVD 120mm" + + #: ../ppdippstr.py:107 +-#, fuzzy + msgid "Double-sided printing" +-msgstr "Riešenie problému s tlačou" ++msgstr "Obojstranná tlač" + + #: ../ppdippstr.py:108 + msgid "Long edge (standard)" +-msgstr "" ++msgstr "Dlhý okraj (štandard)" + + #: ../ppdippstr.py:109 + msgid "Short edge (flip)" +-msgstr "" ++msgstr "Krátky okraj (obrátiť)" + + #: ../ppdippstr.py:110 + msgid "Off" +-msgstr "" ++msgstr "Vypnuté" + + #: ../ppdippstr.py:113 + msgid "Resolution, quality, ink type, media type" +-msgstr "" ++msgstr "Rozlíšenie, kvalita, typ atramentu, typ papiera" + + #: ../ppdippstr.py:114 + msgid "Controlled by 'Printout mode'" +-msgstr "" ++msgstr "Riadené pomocou 'Mód tlače'" + + #: ../ppdippstr.py:116 + msgid "300 dpi, color, black + color cartridge" +-msgstr "" ++msgstr "300 dpi, farebný, čierna + farebná náplň" + + #: ../ppdippstr.py:118 + msgid "300 dpi, draft, color, black + color cartridge" +-msgstr "" ++msgstr "300 dpi, návrh, farebný, čierná + farebná náplň" + + #: ../ppdippstr.py:120 + msgid "300 dpi, draft, grayscale, black + color cartridge" +-msgstr "" ++msgstr "300 dpi, návrh, odtiene šedej, čierná + farebná náplň" + + #: ../ppdippstr.py:122 + msgid "300 dpi, grayscale, black + color cartridge" +-msgstr "" ++msgstr "300 dpi, odtiene šedej, čierná + farebná náplň" + + #: ../ppdippstr.py:124 + msgid "600 dpi, color, black + color cartridge" +-msgstr "" ++msgstr "600 dpi, farebný, čierna + farebná náplň" + + #: ../ppdippstr.py:126 + msgid "600 dpi, grayscale, black + color cartridge" +-msgstr "" ++msgstr "600 dpi, odtiene šedej, čierná + farebná náplň" + + #: ../ppdippstr.py:128 + msgid "600 dpi, photo, black + color cartridge, photo paper" +-msgstr "" ++msgstr "600 dpi, fotografický, čierna + farebná náplň, foto papier" + + #: ../ppdippstr.py:130 + msgid "600 dpi, color, black + color cartridge, photo paper, normal" +-msgstr "" ++msgstr "600 dpi, farebný, čierna + farebná náplň, foto papier, normálne" + + #: ../ppdippstr.py:132 + msgid "1200 dpi, photo, black + color cartridge, photo paper" +-msgstr "" ++msgstr "1200 dpi, fotografický, čierna + farebná náplň, foto papier" + + #: ../system-config-printer.py:121 + msgid "To do this, select System->Administration->Firewall from the main menu." +@@ -1032,7 +1006,7 @@ msgstr "Možnosť '%s' má pevne danú h + + #: ../system-config-printer.py:2447 + msgid "Marker levels are not reported for this printer." +-msgstr "" ++msgstr "Táto tlačiareň nezobrazuje úroveň atrementu." + + #: ../system-config-printer.py:2745 + msgid "Cannot Rename" +@@ -1163,9 +1137,8 @@ msgid "Searching" + msgstr "Hľadá sa" + + #: ../system-config-printer.py:3861 +-#, fuzzy + msgid "Searching for downloadable drivers" +-msgstr "Hľadajú sa ovládače" ++msgstr "Hľadajú sa ovládače k stiahnutiu" + + #: ../system-config-printer.py:3927 ../system-config-printer.py:4230 + msgid "Searching for drivers" +@@ -1184,9 +1157,8 @@ msgid "Searching for printers" + msgstr "Hľadajú sa tlačiarne" + + #: ../system-config-printer.py:4421 +-#, fuzzy + msgid "fetching device list" +-msgstr "načítavanie nastavení servera" ++msgstr "získava sa zoznam zariadení" + + #: ../system-config-printer.py:4558 + msgid " (Current)" +@@ -1194,7 +1166,7 @@ msgstr " (Aktuálny)" + + #: ../system-config-printer.py:4589 + msgid "HP Printer (HPLIP)" +-msgstr "" ++msgstr "Tlačiareň HP (HPLIP)" + + #: ../system-config-printer.py:4624 + msgid "Other" +@@ -1204,14 +1176,12 @@ msgstr "Iné" + #. PhysicalDevice obj + #. Separator? + #: ../system-config-printer.py:4645 +-#, fuzzy + msgid "Network Printer" + msgstr "Sieťová tlačiareň" + + #: ../system-config-printer.py:4649 +-#, fuzzy + msgid "Find Network Printer" +-msgstr "Sieťová tlačiareň" ++msgstr "Nájsť sieťovú tlačiareň" + + #: ../system-config-printer.py:4691 ../system-config-printer.py:5088 + msgid "Scanning..." +@@ -1300,20 +1270,19 @@ msgstr "Lokálna tlačiareň zistená ce + + #: ../system-config-printer.py:5407 + msgid "HPLIP cannot find the device." +-msgstr "" ++msgstr "HPLIP nemôže nájsť zariadenie." + + #: ../system-config-printer.py:5455 +-#, fuzzy + msgid "Not Found" +-msgstr "Nenájdená" ++msgstr "Nenájdené" + + #: ../system-config-printer.py:5456 + msgid "No printer was found at that address." +-msgstr "" ++msgstr "Na zadanej adrese nebola nájdená žiadna tlačiareň." + + #: ../system-config-printer.py:5600 + msgid "-- Select from search results --" +-msgstr "-- Vyberte z výsledkov hľadanie --" ++msgstr "-- Vyberte z výsledkov hľadania --" + + #: ../system-config-printer.py:5602 + msgid "-- No matches found --" +@@ -1336,9 +1305,8 @@ msgid "Distributable" + msgstr "Distribuovateľný" + + #: ../system-config-printer.py:5873 +-#, fuzzy + msgid ", " +-msgstr " " ++msgstr ", " + + #: ../system-config-printer.py:5878 + #, python-format +@@ -1346,10 +1314,12 @@ msgid "" + "\n" + "(%s)" + msgstr "" ++"\n" ++"(%s)" + + #: ../system-config-printer.py:5883 + msgid "No support contacts known" +-msgstr "" ++msgstr "Neznáme kontakty na podporu" + + #: ../system-config-printer.py:5887 ../system-config-printer.py:5900 + msgid "Not specified." +@@ -1371,8 +1341,7 @@ msgstr "Ovládač '%s' nemôže byť pou + #: ../system-config-printer.py:5951 + #, python-format + msgid "You will need to install the '%s' package in order to use this driver." +-msgstr "" +-"Budete musieť nainštalovať balíček '%s', aby bolo možné použiť tento ovládač." ++msgstr "Budete musieť nainštalovať balíček '%s', aby bolo možné použiť tento ovládač." + + #. This error came from trying to open the PPD file. + #: ../system-config-printer.py:5958 +@@ -1411,7 +1380,7 @@ msgstr "pridáva sa tlačiareň %s" + + #: ../system-config-printer.py:6247 + msgid "Would you like to print a test page?" +-msgstr "" ++msgstr "Chcete vytlačiť skušobnú stránku?" + + #: ../system-config-printer.py:6300 + msgid "Install driver" +@@ -1420,8 +1389,7 @@ msgstr "Nainštalovať ovládač" + #: ../system-config-printer.py:6301 + #, python-format + msgid "Printer '%s' requires the %s package but it is not currently installed." +-msgstr "" +-"Tlačiareň '%s' vyžaduje balíček %s, ktorý nie je momentálne nainštalovaný." ++msgstr "Tlačiareň '%s' vyžaduje balíček %s, ktorý nie je momentálne nainštalovaný." + + #: ../system-config-printer.py:6317 + msgid "Missing driver" +@@ -1524,9 +1492,8 @@ msgid "_File" + msgstr "_Súbor" + + #: ../glade/JobsWindow.glade.h:3 +-#, fuzzy + msgid "_Job" +-msgstr "Úloha" ++msgstr "Ú_loha" + + #: ../glade/JobsWindow.glade.h:4 + msgid "_Refresh" +@@ -1561,9 +1528,8 @@ msgid "Enter device URI" + msgstr "Zadajte URI zariadenia" + + #: ../glade/NewPrinterWindow.glade.h:5 +-#, fuzzy + msgid "HP Printer (HPLIP) via network" +-msgstr "Názov tlačiarne" ++msgstr "Tlačiareň HP (HPLIP) cez sieť" + + #: ../glade/NewPrinterWindow.glade.h:6 + msgid "IPP Printer" +@@ -1586,18 +1552,16 @@ msgid "Location (optional)" + msgstr "Umiestnenie (voliteľné)" + + #: ../glade/NewPrinterWindow.glade.h:11 +-#, fuzzy + msgid "Network Printer" +-msgstr "Sieťová tlačiareň" ++msgstr "Sieťová tlačiareň" + + #: ../glade/NewPrinterWindow.glade.h:12 + msgid "Note" + msgstr "Poznámka" + + #: ../glade/NewPrinterWindow.glade.h:13 +-#, fuzzy + msgid "Output Quality" +-msgstr "Stav" ++msgstr "Kvalita výstupu" + + #: ../glade/NewPrinterWindow.glade.h:14 + msgid "Printer Name" +@@ -1755,17 +1719,16 @@ msgid "Flow Control" + msgstr "Riadenie toku" + + #: ../glade/NewPrinterWindow.glade.h:60 +-msgid "" +-"For the printer you have selected there are drivers available for download." ++msgid "For the printer you have selected there are drivers available for download." + msgstr "Pre vami vybranú tlačiareň sú dostupné ovládače na stiahnutie." + + #: ../glade/NewPrinterWindow.glade.h:61 + msgid "Free software" +-msgstr "" ++msgstr "Sloboný softvér" + + #: ../glade/NewPrinterWindow.glade.h:62 + msgid "Graphics:" +-msgstr "" ++msgstr "Grafika:" + + #: ../glade/NewPrinterWindow.glade.h:63 + msgid "Host:" +@@ -1792,9 +1755,8 @@ msgid "License:" + msgstr "Licencia:" + + #: ../glade/NewPrinterWindow.glade.h:69 +-#, fuzzy + msgid "Line art:" +-msgstr "Stav tlačiarne:" ++msgstr "Jemná grafika:" + + #: ../glade/NewPrinterWindow.glade.h:70 + msgid "Local Driver" +@@ -1805,14 +1767,12 @@ msgid "Make and model:" + msgstr "Výrobca a model:" + + #: ../glade/NewPrinterWindow.glade.h:72 +-#, fuzzy + msgid "Manufacturer" +-msgstr "Výrobca / Model" ++msgstr "Výrobca" + + #: ../glade/NewPrinterWindow.glade.h:73 +-#, fuzzy + msgid "Network" +-msgstr "Sieťová tlačiareň" ++msgstr "Sieť" + + #: ../glade/NewPrinterWindow.glade.h:75 + msgid "No, I do not accept this license" +@@ -1824,11 +1784,11 @@ msgstr "Parita" + + #: ../glade/NewPrinterWindow.glade.h:78 + msgid "Patented algorithms" +-msgstr "" ++msgstr "Patentované algoritmy" + + #: ../glade/NewPrinterWindow.glade.h:79 + msgid "Photo:" +-msgstr "" ++msgstr "Foto:" + + #: ../glade/NewPrinterWindow.glade.h:80 + msgid "Port number:" +@@ -1901,14 +1861,12 @@ msgid "Supplier:" + msgstr "Dodávateľ:" + + #: ../glade/NewPrinterWindow.glade.h:96 +-#, fuzzy + msgid "Support:" +-msgstr "Dodávateľ:" ++msgstr "Podpora:" + + #: ../glade/NewPrinterWindow.glade.h:97 +-#, fuzzy + msgid "Text:" +-msgstr "Test" ++msgstr "Text:" + + #: ../glade/NewPrinterWindow.glade.h:98 + msgid "" +@@ -1996,13 +1954,12 @@ msgstr "O_veriť..." + #: ../glade/NewPrinterWindow.glade.h:112 + #: ../glade/PrinterPropertiesDialog.glade.h:128 + msgid "move left" +-msgstr "" ++msgstr "posunúť doľava" + + #: ../glade/NewPrinterWindow.glade.h:113 + #: ../glade/PrinterPropertiesDialog.glade.h:129 +-#, fuzzy + msgid "move right" +-msgstr "Copyright" ++msgstr "posunúť doprava" + + #: ../glade/PrinterPropertiesDialog.glade.h:1 + msgid " " +@@ -2041,9 +1998,8 @@ msgid "Image Options" + msgstr "Možnosti obrázkov" + + #: ../glade/PrinterPropertiesDialog.glade.h:12 +-#, fuzzy + msgid "Ink/Toner Levels" +-msgstr "Deliaca stránka" ++msgstr "Úroveň náplne/tonera" + + #: ../glade/PrinterPropertiesDialog.glade.h:13 + msgid "Other Options (Advanced)" +@@ -2062,9 +2018,8 @@ msgid "State" + msgstr "Stav" + + #: ../glade/PrinterPropertiesDialog.glade.h:17 +-#, fuzzy + msgid "Status Messages" +-msgstr "Stavová správa" ++msgstr "Stavová správa" + + #: ../glade/PrinterPropertiesDialog.glade.h:18 + msgid "Tests and Maintenance" +@@ -2125,7 +2080,7 @@ msgstr "Stĺpcov:" + + #: ../glade/PrinterPropertiesDialog.glade.h:33 + msgid "Copies:" +-msgstr "Kopie:" ++msgstr "Kópie:" + + #: ../glade/PrinterPropertiesDialog.glade.h:34 + msgid "Deny printing for everyone except these users:" +@@ -2141,7 +2096,7 @@ msgstr "Povolená" + + #: ../glade/PrinterPropertiesDialog.glade.h:38 + msgid "Ending Banner:" +-msgstr "Zápätie:" ++msgstr "Koncová stránka:" + + #: ../glade/PrinterPropertiesDialog.glade.h:39 + msgid "Error Policy: \t" +@@ -2165,7 +2120,7 @@ msgstr "Vyváženie farieb:" + + #: ../glade/PrinterPropertiesDialog.glade.h:44 + msgid "Ink/Toner Levels" +-msgstr "" ++msgstr "Úroveň náplne/tonera" + + #: ../glade/PrinterPropertiesDialog.glade.h:45 + msgid "Installed Options" +@@ -2408,9 +2363,8 @@ msgid "Starting Banner:" + msgstr "Oddeľovacia stránka na začiatku:" + + #: ../glade/PrinterPropertiesDialog.glade.h:123 +-#, fuzzy + msgid "There are no status messages for this printer." +-msgstr "S touto frontou sú spojené stavové správy." ++msgstr "Pre túto tlačiareň nie sú žiadne stavové správy." + + #: ../glade/PrinterPropertiesDialog.glade.h:124 + msgid "To add a new option, enter its name in the box below and click to add." +@@ -2439,9 +2393,8 @@ msgid "points" + msgstr "bodov" + + #: ../glade/PrinterPropertiesDialog.glade.h:132 +-#, fuzzy + msgid "user" +-msgstr "Používateľ" ++msgstr "používateľ" + + #: ../glade/PrintersWindow.glade.h:1 + msgid "Adjust server settings" +@@ -2544,9 +2497,8 @@ msgid "SMB Browser" + msgstr "Prehliadač SMB" + + #: ../glade/statusicon_popupmenu.glade.h:1 +-#, fuzzy + msgid "_Configure Printers" +-msgstr "Konfigurovať tlačiarne" ++msgstr "_Konfigurovať tlačiarne" + + #: ../glade/statusicon_popupmenu.glade.h:2 + msgid "_Hide" +@@ -2677,14 +2629,12 @@ msgid "Printer '%s': '%s'." + msgstr "Tlačiareň '%s': '%s'." + + #: ../timedops.py:100 ../timedops.py:168 +-#, fuzzy + msgid "Please wait" + msgstr "Čakajte, prosím" + + #: ../timedops.py:106 ../timedops.py:175 +-#, fuzzy + msgid "Gathering information" +-msgstr "Informácie" ++msgstr "Zhromažďovanie informácii" + + #: ../ToolbarSearchEntry.py:73 + msgid "_Filter:" +@@ -2715,13 +2665,12 @@ msgstr "" + "nezverejňuje zdieľané tlačiarne po sieti." + + #: ../troubleshoot/CheckLocalServerPublishing.py:33 +-#, fuzzy + msgid "" + "Enable the 'Publish shared printers connected to this system' option in the " + "server settings using the printing administration tool." + msgstr "" + "Aktivujte voľbu 'Publikovať zdieľané tlačiarne pripojené k tomuto systému' v " +-"nastavení servera." ++"nastavení servera pomocou nástroja správy tlače." + + #: ../troubleshoot/CheckPPDSanity.py:44 ../applet.py:147 + msgid "Install" +@@ -2751,15 +2700,12 @@ msgstr "Chýbajúci ovládač tlačiarne + #: ../troubleshoot/CheckPPDSanity.py:131 + #, python-format + msgid "Printer `%s' requires the %s package but it is not currently installed." +-msgstr "" +-"Tlačiareň `%s' vyžaduje balíček %s, ktorý nie je momentálne nainštalovaný." ++msgstr "Tlačiareň `%s' vyžaduje balíček %s, ktorý nie je momentálne nainštalovaný." + + #: ../troubleshoot/CheckPPDSanity.py:136 + #, python-format +-msgid "" +-"Printer `%s' requires the `%s' program but it is not currently installed." +-msgstr "" +-"Tlačiareň `%s' vyžaduje program %s, ktorý nie je momentálne nainštalovaný." ++msgid "Printer `%s' requires the `%s' program but it is not currently installed." ++msgstr "Tlačiareň `%s' vyžaduje program %s, ktorý nie je momentálne nainštalovaný." + + #: ../troubleshoot/ChooseNetworkPrinter.py:29 + msgid "Choose Network Printer" +@@ -2841,23 +2787,23 @@ msgstr "Chybový výpis obsahuje správy + + #: ../troubleshoot/Locale.py:29 + msgid "Incorrect Page Size" +-msgstr "" ++msgstr "Neplatná veľkosť stránky" + + #: ../troubleshoot/Locale.py:30 + msgid "" + "The page size for the print job was not the printer's default page size. If " + "this is not intentional it may cause alignment problems." + msgstr "" ++"Veľkosť stránky pre tlačovú úlohu neodpovedala predvolenému nastaveniu tlačiarne. " ++"Môže to spôsobiť problémy so zarovnaním, ak to nebol zámer." + + #: ../troubleshoot/Locale.py:43 +-#, fuzzy + msgid "Print job page size:" +-msgstr "Vytlačiť skúšobnú stránku" ++msgstr "Veľkosť stránky pre tlačovú úlohu:" + + #: ../troubleshoot/Locale.py:48 +-#, fuzzy + msgid "Printer page size:" +-msgstr "Stav tlačiarne:" ++msgstr "Veľkosť stránky pre tlačiareň:" + + #: ../troubleshoot/LocalOrRemote.py:26 + msgid "Printer Location" +@@ -2935,7 +2881,7 @@ msgstr "Nie" + #: ../troubleshoot/PrintTestPage.py:143 + #, python-format + msgid "Remember to load paper of type '%s' into the printer first." +-msgstr "" ++msgstr "Nezabudnite najskôr vložiť typ papiera '%s' do tlačiarne." + + #: ../troubleshoot/PrintTestPage.py:399 + msgid "Error submitting test page" +@@ -2993,8 +2939,7 @@ msgstr "Vzdialená adresa" + msgid "" + "Please enter as many details as you can about the network address of this " + "printer." +-msgstr "" +-"Prosím zadajte čo najviac podrobností o sieťovej adrese tejto tlačiarne." ++msgstr "Prosím zadajte čo najviac podrobností o sieťovej adrese tejto tlačiarne." + + #: ../troubleshoot/RemoteAddress.py:35 + msgid "Server name:" +@@ -3089,7 +3034,6 @@ msgid "`%s' is ready for printing." + msgstr "`%s' je pripravená tlačiť." + + #: ../applet.py:156 ../applet.py:167 +-#, fuzzy + msgid "Print test page" + msgstr "Vytlačiť skúšobnú stránku" + +@@ -3108,7 +3052,7 @@ msgstr "Nájsť ovládač" + + #: ../print-applet.desktop.in.h:1 + msgid "Print Queue Applet" +-msgstr "Aplet tlačovej fronty" ++msgstr "Applet tlačovej fronty" + + #: ../print-applet.desktop.in.h:2 + msgid "System tray icon for managing print jobs" +diff -up system-config-printer-1.1.3/po/zh_CN.po.git-1.1.x system-config-printer-1.1.3/po/zh_CN.po +--- system-config-printer-1.1.3/po/zh_CN.po.git-1.1.x 2009-02-03 12:33:33.000000000 +0000 ++++ system-config-printer-1.1.3/po/zh_CN.po 2009-02-10 16:54:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-# translation of system-config-printer.1.0.x.po to Simplified Chinese ++# translation of system-config-printer.1.1.x.po to Simplified Chinese + # Simplified Chinese Version of printconf file. + # Copyright (C) 2002,2003,2004, 2006, 2008 Free Software Foundation, Inc. + # Sarah Wang , 2003,2004. +@@ -7,20 +7,21 @@ + # Liu Tao , 2008. + # Leah Liu , 2008. + # 甘露 (Gan Lu) , 2008. +-# Tian Shixiong , 2008.甘露(Gan Lu) , 2008. +-# +-# ++# Tian Shixiong , 2008, 2009 ++# 甘露(Gan Lu) , 2008. ++# ++# + msgid "" + msgstr "" + "Project-Id-Version: system-config-printer.1.0.x\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" +-"POT-Creation-Date: 2009-02-03 12:31+0000\n" +-"PO-Revision-Date: 2008-11-20 23:02+0800\n" ++"POT-Creation-Date: 2009-02-03 13:18+0000\n" ++"PO-Revision-Date: 2009-02-05 20:34+0800\n" + "Last-Translator: TianShixiong \n" + "Language-Team: Chinese/Simplified \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" ++"Content-Transfer-Encoding: 8bit" + + #: ../AdvancedServerSettings.py:41 + msgid "Advanced Server Settings" +@@ -81,9 +82,9 @@ msgid "Operation canceled" + msgstr "操作取消：" + + #: ../authconn.py:234 +-#, fuzzy, python-format ++#, python-format + msgid "CUPS server error (%s)" +-msgstr "CUPS 服务器错误" ++msgstr "CUPS服务器错误(%s)" + + #: ../authconn.py:236 ../errordialogs.py:57 + #: ../troubleshoot/PrintTestPage.py:400 +@@ -212,9 +213,8 @@ msgid "Re_print" + msgstr "重新打印(_p)" + + #: ../jobviewer.py:174 +-#, fuzzy + msgid "_Authenticate" +-msgstr "验证" ++msgstr "_验证" + + #: ../jobviewer.py:212 ../troubleshoot/PrintTestPage.py:82 + msgid "Job" +@@ -288,7 +288,6 @@ msgid "%d minutes ago" + msgstr "%d 分钟前" + + #: ../jobviewer.py:403 +-#, fuzzy + msgid "an hour ago" + msgstr "一小时前" + +@@ -299,21 +298,21 @@ msgstr "%d 小时前" + + #: ../jobviewer.py:409 + msgid "yesterday" +-msgstr "" ++msgstr "昨天" + + #: ../jobviewer.py:411 +-#, fuzzy, python-format ++#, python-format + msgid "%d days ago" +-msgstr "%d 小时前" ++msgstr "%d 天前" + + #: ../jobviewer.py:415 + msgid "last week" +-msgstr "" ++msgstr "上周" + + #: ../jobviewer.py:417 +-#, fuzzy, python-format ++#, python-format + msgid "%d weeks ago" +-msgstr "%d 分钟前" ++msgstr "%d星期前" + + #: ../jobviewer.py:548 + msgid "Held for authentication" +@@ -324,23 +323,22 @@ msgid "Held" + msgstr "帮助(_H)" + + #: ../jobviewer.py:577 +-#, fuzzy, python-format ++#, python-format + msgid "Held until %s" +-msgstr "保留到：" ++msgstr "保留到%s：" + + #: ../jobviewer.py:581 +-#, fuzzy + msgid "Held until day-time" +-msgstr "保留到：" ++msgstr "保留一天：" + + #: ../jobviewer.py:583 +-#, fuzzy + msgid "Held until evening" +-msgstr "保留到：" ++msgstr "保留到晚上：" + + #: ../jobviewer.py:585 ++#, fuzzy + msgid "Held until night-time" +-msgstr "" ++msgstr "保留一夜:" + + #: ../jobviewer.py:587 + msgid "Held until second shift" +@@ -351,9 +349,8 @@ msgid "Held until third shift" + msgstr "" + + #: ../jobviewer.py:591 +-#, fuzzy + msgid "Held until weekend" +-msgstr "保留到：" ++msgstr "保留到周末：" + + #: ../jobviewer.py:594 ../troubleshoot/PrintTestPage.py:41 + msgid "Pending" +@@ -436,14 +433,14 @@ msgid "%d documents queued" + msgstr "%d 个排队的文档" + + #: ../jobviewer.py:1234 +-#, fuzzy, python-format ++#, python-format + msgid "Job %d completed" +-msgstr "已完成" ++msgstr "任务%d已完成" + + #: ../jobviewer.py:1235 + #, python-format + msgid "Document `%s' has finished printing on `%s'." +-msgstr "" ++msgstr "文档'%s'已在'%s'上完成打印." + + #: ../jobviewer.py:1383 + #, python-format +@@ -513,9 +510,8 @@ msgid "Default behavior" + msgstr "默认行为" + + #: ../ppdippstr.py:45 +-#, fuzzy + msgid "Authenticated" +-msgstr "验证" ++msgstr "已验证" + + #: ../ppdippstr.py:50 ../system-config-printer.py:5839 + msgid "None" +@@ -1165,7 +1161,7 @@ msgstr " (当前)" + + #: ../system-config-printer.py:4589 + msgid "HP Printer (HPLIP)" +-msgstr "" ++msgstr "HP打印机(HPLIP)" + + #: ../system-config-printer.py:4624 + msgid "Other" +@@ -1175,14 +1171,12 @@ msgstr "其它" + #. PhysicalDevice obj + #. Separator? + #: ../system-config-printer.py:4645 +-#, fuzzy + msgid "Network Printer" + msgstr "网络打印机" + + #: ../system-config-printer.py:4649 +-#, fuzzy + msgid "Find Network Printer" +-msgstr "网络打印机" ++msgstr "寻找网络打印机" + + #: ../system-config-printer.py:4691 ../system-config-printer.py:5088 + msgid "Scanning..." +@@ -1264,16 +1258,15 @@ msgstr "Hardware Abstraction Layer (HAL) + + #: ../system-config-printer.py:5407 + msgid "HPLIP cannot find the device." +-msgstr "" ++msgstr "HPLIP无法找到该设备." + + #: ../system-config-printer.py:5455 +-#, fuzzy + msgid "Not Found" + msgstr "未找到" + + #: ../system-config-printer.py:5456 + msgid "No printer was found at that address." +-msgstr "" ++msgstr "该地址未找到打印机." + + #: ../system-config-printer.py:5600 + msgid "-- Select from search results --" +@@ -1476,9 +1469,8 @@ msgid "_File" + msgstr "(_F)文件" + + #: ../glade/JobsWindow.glade.h:3 +-#, fuzzy + msgid "_Job" +-msgstr "任务" ++msgstr "_任务" + + #: ../glade/JobsWindow.glade.h:4 + msgid "_Refresh" +@@ -1513,9 +1505,8 @@ msgid "Enter device URI" + msgstr "输入设备 URI" + + #: ../glade/NewPrinterWindow.glade.h:5 +-#, fuzzy + msgid "HP Printer (HPLIP) via network" +-msgstr "打印机名" ++msgstr "网络中的HP打印机(HPLIP)" + + #: ../glade/NewPrinterWindow.glade.h:6 + msgid "IPP Printer" +@@ -1538,9 +1529,8 @@ msgid "Location (optional)" + msgstr "位置 (可选)" + + #: ../glade/NewPrinterWindow.glade.h:11 +-#, fuzzy + msgid "Network Printer" +-msgstr "网络打印机" ++msgstr "网络打印机" + + #: ../glade/NewPrinterWindow.glade.h:12 + msgid "Note" +@@ -1759,9 +1749,8 @@ msgid "Manufacturer" + msgstr "制造商" + + #: ../glade/NewPrinterWindow.glade.h:73 +-#, fuzzy + msgid "Network" +-msgstr "网络打印机" ++msgstr "网络" + + #: ../glade/NewPrinterWindow.glade.h:75 + msgid "No, I do not accept this license" +@@ -1934,12 +1923,12 @@ msgstr "验证(_V)..." + #: ../glade/NewPrinterWindow.glade.h:112 + #: ../glade/PrinterPropertiesDialog.glade.h:128 + msgid "move left" +-msgstr "" ++msgstr "左移" + + #: ../glade/NewPrinterWindow.glade.h:113 + #: ../glade/PrinterPropertiesDialog.glade.h:129 + msgid "move right" +-msgstr "" ++msgstr "右移" + + #: ../glade/PrinterPropertiesDialog.glade.h:1 + msgid " " +@@ -1978,9 +1967,8 @@ msgid "Image Options" + msgstr "映像选项" + + #: ../glade/PrinterPropertiesDialog.glade.h:12 +-#, fuzzy + msgid "Ink/Toner Levels" +-msgstr "Banner" ++msgstr "墨粉/炭粉含量" + + #: ../glade/PrinterPropertiesDialog.glade.h:13 + msgid "Other Options (Advanced)" +@@ -1999,9 +1987,8 @@ msgid "State" + msgstr "状态" + + #: ../glade/PrinterPropertiesDialog.glade.h:17 +-#, fuzzy + msgid "Status Messages" +-msgstr "状态信息" ++msgstr "状态信息" + + #: ../glade/PrinterPropertiesDialog.glade.h:18 + msgid "Tests and Maintenance" +@@ -2102,7 +2089,7 @@ msgstr "色彩调整：" + + #: ../glade/PrinterPropertiesDialog.glade.h:44 + msgid "Ink/Toner Levels" +-msgstr "" ++msgstr "墨粉/炭粉含量" + + #: ../glade/PrinterPropertiesDialog.glade.h:45 + msgid "Installed Options" +@@ -2343,9 +2330,8 @@ msgid "Starting Banner:" + msgstr "开始 Banner：" + + #: ../glade/PrinterPropertiesDialog.glade.h:123 +-#, fuzzy + msgid "There are no status messages for this printer." +-msgstr "有一些与这个队列有关的状态信息。" ++msgstr "没有此打印机的状态信息." + + #: ../glade/PrinterPropertiesDialog.glade.h:124 + msgid "To add a new option, enter its name in the box below and click to add." +@@ -2372,7 +2358,6 @@ msgid "points" + msgstr "点" + + #: ../glade/PrinterPropertiesDialog.glade.h:132 +-#, fuzzy + msgid "user" + msgstr "用户" + +@@ -2609,14 +2594,12 @@ msgid "Printer '%s': '%s'." + msgstr "打印机 '%s'：'%s'" + + #: ../timedops.py:100 ../timedops.py:168 +-#, fuzzy + msgid "Please wait" + msgstr "请等待" + + #: ../timedops.py:106 ../timedops.py:175 +-#, fuzzy + msgid "Gathering information" +-msgstr "信息" ++msgstr "正在收集信息" + + #: ../ToolbarSearchEntry.py:73 + msgid "_Filter:" +@@ -2645,12 +2628,11 @@ msgstr "" + "导出到网络中。" + + #: ../troubleshoot/CheckLocalServerPublishing.py:33 +-#, fuzzy + msgid "" + "Enable the 'Publish shared printers connected to this system' option in the " + "server settings using the printing administration tool." + msgstr "" +-"在使用打印管理工具进行服务器设置时请启用‘共享连接到此系统的共享发布打印机’。" ++"使用打印管理工具在服务器设置中启用\"共享连接到此系统的打印机\"选项。" + + #: ../troubleshoot/CheckPPDSanity.py:44 ../applet.py:147 + msgid "Install" +@@ -2766,23 +2748,23 @@ msgstr "出错日志中的信息。" + + #: ../troubleshoot/Locale.py:29 + msgid "Incorrect Page Size" +-msgstr "" ++msgstr "页面尺寸不正确" + + #: ../troubleshoot/Locale.py:30 + msgid "" + "The page size for the print job was not the printer's default page size. If " + "this is not intentional it may cause alignment problems." + msgstr "" ++"打印任务的页面尺寸不是打印机默认页面尺寸.若并非有意如此,那么这将产生对齐问题." + + #: ../troubleshoot/Locale.py:43 + #, fuzzy + msgid "Print job page size:" +-msgstr "打印测试页" ++msgstr "打印任务页面尺寸:" + + #: ../troubleshoot/Locale.py:48 +-#, fuzzy + msgid "Printer page size:" +-msgstr "打印机状态：" ++msgstr "打印机页面尺寸：" + + #: ../troubleshoot/LocalOrRemote.py:26 + msgid "Printer Location" diff -up system-config-printer-1.1.3/system-config-printer.py.git-1.1.x system-config-printer-1.1.3/system-config-printer.py --- system-config-printer-1.1.3/system-config-printer.py.git-1.1.x 2009-02-03 12:30:29.000000000 +0000 -+++ system-config-printer-1.1.3/system-config-printer.py 2009-02-05 10:52:40.000000000 +0000 -@@ -2003,7 +2003,7 @@ class GUI(GtkGUI, monitor.Watcher): ++++ system-config-printer-1.1.3/system-config-printer.py 2009-02-10 16:54:17.000000000 +0000 +@@ -854,6 +854,8 @@ class GUI(GtkGUI, monitor.Watcher): + name = unicode (model.get_value (iter, 2)) + if name == queue: + path = model.get_path (iter) ++ self.dests_iconview.scroll_to_path (path, True, 0.5, 0.5) ++ self.dests_iconview.set_cursor (path) + self.dests_iconview.item_activated (path) + break + iter = model.iter_next (iter) +@@ -2003,7 +2005,7 @@ class GUI(GtkGUI, monitor.Watcher): self.cups._end_operation () self.changed = set() # of options @@ -4372,3 +5736,63 @@ diff -up system-config-printer-1.1.3/system-config-printer.py.git-1.1.x system-c # We can authenticate with the server correctly at this point, # but we have never fetched the server settings to see whether # the server is publishing shared printers. Fetch the settings +@@ -2487,7 +2489,6 @@ class GUI(GtkGUI, monitor.Watcher): + def updateStateReasons (self): + printer = self.printer + reasons = printer.other_attributes.get ('printer-state-reasons', []) +- print reasons + store = gtk.ListStore (int, str) + any = False + for reason in reasons: +@@ -3391,7 +3392,7 @@ class GUI(GtkGUI, monitor.Watcher): + self.cups = None + gtk.gdk.threads_enter () + self.setConnected () +- self.populateList () ++ self.populateList (prompt_allowed=False) + gtk.gdk.threads_leave () + + class NewPrinterGUI(GtkGUI): +@@ -3819,10 +3820,10 @@ class NewPrinterGUI(GtkGUI): + + def getJockeyDriver_thread(self, id): + debugprint ("Requesting driver from Jockey: %s" % id) +- bus = dbus.SessionBus() + self.jockey_driver_result = False + self.jockey_installed_files = [] + try: ++ bus = dbus.SessionBus() + obj = bus.get_object("com.ubuntu.DeviceDriver", "/GUI") + jockeyloader = \ + dbus.Interface(obj, "com.ubuntu.DeviceDriver") +@@ -5982,8 +5983,9 @@ class NewPrinterGUI(GtkGUI): + + debugprint("ppd: " + repr(ppd)) + if isinstance(ppd, str) or isinstance(ppd, unicode): ++ self.mainapp.cups._begin_operation (_("fetching PPD")) + try: +- if (ppd != "raw"): ++ if ppd != "raw": + f = self.mainapp.cups.getServerPPD(ppd) + ppd = cups.PPD(f) + os.unlink(f) +@@ -5994,7 +5996,9 @@ class NewPrinterGUI(GtkGUI): + nonfatalException() + debugprint ("CUPS 1.3 server not available: never mind") + +- return ppd ++ self.mainapp.cups._end_operation () ++ ++ return ppd + + # Installable Options + +@@ -6358,7 +6362,7 @@ if __name__ == "__main__": + configure_printer = optarg + if opt == "--choose-driver": + change_ppd = True +- elif opt == "print-test-page": ++ elif opt == "--print-test-page": + print_test_page = True + + elif opt == '--devid': diff --git a/system-config-printer.spec b/system-config-printer.spec index 2781950..17d7016 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -7,7 +7,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -169,6 +169,14 @@ rm -rf %buildroot exit 0 %changelog +* Tue Feb 10 2009 Tim Waugh 1.1.3-5 +- Updated from git: + - Handle D-Bus failures when querying Jockey (bug #484402). + - Set operation when fetching PPD from server (bug #484130). + - Don't allow prompting when updating the UI for a server failure + (bug #484130). + - Fixed printing a test page from the applet (bug #484130). + * Mon Feb 9 2009 Tim Waugh 1.1.3-4 - Requires libxml2-python.