rpms/system-config-printer/F-7 system-config-printer-0.7.74.10.tar.bz2.sig, NONE, 1.1 system-config-printer-0.7.74.x.patch, 1.2, 1.3 system-config-printer.spec, 1.124, 1.125 system-config-printer-0.7.74.8.tar.bz2.sig, 1.1, NONE system-config-printer-british.patch, 1.1, NONE

Sat Feb 2 11:16:58 UTC 2008

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32352

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.10.tar.bz2.sig 
	system-config-printer-0.7.74.x.patch 
Removed Files:
	system-config-printer-0.7.74.8.tar.bz2.sig 
	system-config-printer-british.patch 
Log Message:
* Sat Feb  2 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.10-3
- Added missing debugprint function (bug #431252).

--- NEW FILE system-config-printer-0.7.74.10.tar.bz2.sig ---
ˆ?
system-config-printer-0.7.74.x.patch:

Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: system-config-printer-0.7.74.x.patch
diff -N system-config-printer-0.7.74.x.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ system-config-printer-0.7.74.x.patch	2 Feb 2008 11:16:40 -0000	1.3
@@ -0,0 +1,1346 @@
+diff -up system-config-printer-0.7.74.10/system-config-printer.py.0.7.74.x system-config-printer-0.7.74.10/system-config-printer.py
+--- system-config-printer-0.7.74.10/system-config-printer.py.0.7.74.x	2008-01-24 10:07:12.000000000 +0000
++++ system-config-printer-0.7.74.10/system-config-printer.py	2008-02-02 11:10:52.000000000 +0000
+@@ -74,6 +74,12 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WAT
+ ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
+ ellipsis = unichr(0x2026)
+ 
++def debugprint(x):
++    try:
++        print x
++    except:
++        pass
++
+ try:
+     try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
+ except AttributeError:
+diff -up system-config-printer-0.7.74.10/po/de.po.0.7.74.x system-config-printer-0.7.74.10/po/de.po
+--- system-config-printer-0.7.74.10/po/de.po.0.7.74.x	2008-01-24 10:08:46.000000000 +0000
++++ system-config-printer-0.7.74.10/po/de.po	2008-02-02 11:10:52.000000000 +0000
+@@ -14,9 +14,9 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: system-config-printer.trunk.de\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+-"POT-Creation-Date: 2008-01-16 17:31+0000\n"
+-"PO-Revision-Date: 2007-11-21 09:58+1000\n"
+-"Last-Translator: PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>\n"
++"POT-Creation-Date: 2008-01-17 02:32-0700\n"
++"PO-Revision-Date: 2008-01-29 22:35+0100\n"
++"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
+ "Language-Team:  <de at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -30,7 +30,8 @@ msgstr ""
+ msgid "Idle"
+ msgstr "Bereit"
+ 
+-#: ../cupshelpers.py:28 ../applet.py:731
++#: ../cupshelpers.py:28
++#: ../applet.py:731
+ msgid "Processing"
+ msgstr "Verarbeite"
+ 
+@@ -38,28 +39,35 @@ msgstr "Verarbeite"
+ msgid "Busy"
+ msgstr "BeschÃ¤ftigt"
+ 
+-#: ../cupshelpers.py:30 ../applet.py:732
++#: ../cupshelpers.py:30
++#: ../applet.py:732
+ msgid "Stopped"
+ msgstr "Angehalten"
+ 
+-#: ../cupshelpers.py:47 ../applet.py:741
++#: ../cupshelpers.py:47
++#: ../applet.py:741
+ msgid "Unknown"
+ msgstr "Unbekannt"
+ 
+-#: ../my-default-printer.py:125 ../my-default-printer.desktop.in.h:1
++#: ../my-default-printer.py:125
++#: ../my-default-printer.desktop.in.h:1
+ msgid "Default Printer"
+ msgstr "Standarddrucker"
+ 
+-#: ../my-default-printer.py:129 ../my-default-printer.py:160
++#: ../my-default-printer.py:129
++#: ../my-default-printer.py:160
+ msgid "_Use System Default"
+ msgstr "Standardeinstell_ung des Systems verwenden"
+ 
+-#: ../my-default-printer.py:130 ../my-default-printer.py:162
++#: ../my-default-printer.py:130
++#: ../my-default-printer.py:162
+ msgid "_Set Default"
+ msgstr "_Standard setzen"
+ 
+-#: ../my-default-printer.py:140 ../system-config-printer.glade.h:198
+-#: ../applet.py:186 ../applet.py:226
++#: ../my-default-printer.py:140
++#: ../system-config-printer.glade.h:198
++#: ../applet.py:186
++#: ../applet.py:226
+ msgid "Printer"
+ msgstr "Drucker"
+ 
+@@ -79,11 +87,13 @@ msgstr "Copyright 2006, 2007 Red Hat, In
+ msgid "Server Settings"
+ msgstr "Server-Einstellungen"
+ 
+-#: ../system-config-printer.py:297 ../system-config-printer.py:299
++#: ../system-config-printer.py:297
++#: ../system-config-printer.py:299
+ msgid "Members of this class"
+ msgstr "Mitglieder dieser Klasse"
+ 
+-#: ../system-config-printer.py:298 ../system-config-printer.py:300
++#: ../system-config-printer.py:298
++#: ../system-config-printer.py:300
+ msgid "Others"
+ msgstr "Andere"
+ 
+@@ -120,7 +130,8 @@ msgstr "Freigabe"
+ msgid "Comment"
+ msgstr "Kommentar"
+ 
+-#: ../system-config-printer.py:561 ../system-config-printer.py:2493
++#: ../system-config-printer.py:561
++#: ../system-config-printer.py:2493
+ msgid "Searching"
+ msgstr "Suche"
+ 
+@@ -138,7 +149,8 @@ msgstr "Druckerkonfiguration - %s"
+ msgid "Connected to %s"
+ msgstr "Verbunden mit %s"
+ 
+-#: ../system-config-printer.py:610 ../system-config-printer.py:1301
++#: ../system-config-printer.py:610
++#: ../system-config-printer.py:1301
+ msgid "Not connected"
+ msgstr "Nicht verbunden"
+ 
+@@ -167,11 +179,13 @@ msgstr ""
+ "Verbinden mit dem Server:\n"
+ "%s"
+ 
+-#: ../system-config-printer.py:1230 ../system-config-printer.glade.h:122
++#: ../system-config-printer.py:1230
++#: ../system-config-printer.glade.h:122
+ msgid "Installable Options"
+ msgstr "Installierbare Optionen"
+ 
+-#: ../system-config-printer.py:1231 ../system-config-printer.glade.h:199
++#: ../system-config-printer.py:1231
++#: ../system-config-printer.glade.h:199
+ msgid "Printer Options"
+ msgstr "Druckeroptionen"
+ 
+@@ -185,32 +199,32 @@ msgstr ""
+ "Ã„nderungen kÃ¶nnen nur Ã¼bernommen werden,\n"
+ "wenn diese Konflikte gelÃ¶st werden."
+ 
+-#: ../system-config-printer.py:1269 ../system-config-printer.py:1285
++#: ../system-config-printer.py:1269
++#: ../system-config-printer.py:1285
+ #: ../applet.py:349
+ msgid "Not authorized"
+ msgstr "Nicht berechtigt"
+ 
+-#: ../system-config-printer.py:1270 ../applet.py:350
++#: ../system-config-printer.py:1270
++#: ../applet.py:350
+ msgid "The password may be incorrect."
+ msgstr "Das Passwort ist womÃ¶glich falsch."
+ 
+-#: ../system-config-printer.py:1273 ../system-config-printer.py:1306
++#: ../system-config-printer.py:1273
++#: ../system-config-printer.py:1306
+ #: ../applet.py:353
+ msgid "CUPS server error"
+ msgstr "CUPS-Serverfehler"
+ 
+-#: ../system-config-printer.py:1274 ../applet.py:354
++#: ../system-config-printer.py:1274
++#: ../applet.py:354
+ #, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+ msgstr "Beim Betrieb von CUPS trat ein Fehler auf: '%s'."
+ 
+ #: ../system-config-printer.py:1286
+-msgid ""
+-"The password may be incorrect, or the server may be configured to deny "
+-"remote administration."
+-msgstr ""
+-"Das Passwort ist mÃ¶glicherweise falsch oder der Server ist so konfiguriert, "
+-"dass er Remote-Administration verweigert."
++msgid "The password may be incorrect, or the server may be configured to deny remote administration."
++msgstr "Das Passwort ist mÃ¶glicherweise falsch oder der Server ist so konfiguriert, dass er Remote-Administration verweigert."
+ 
+ #: ../system-config-printer.py:1291
+ msgid "Bad request"
+@@ -264,12 +278,8 @@ msgid "Not possible"
+ msgstr "Nicht mÃ¶glich"
+ 
+ #: ../system-config-printer.py:1559
+-msgid ""
+-"The remote server did not accept the print job, most likely because the "
+-"printer is not shared."
+-msgstr ""
+-"Der entfernte Server akzeptiert keine AuftrÃ¤ge. Ein mÃ¶glicher Fehler ist, "
+-"dass der Drucker nicht freigegeben ist."
++msgid "The remote server did not accept the print job, most likely because the printer is not shared."
++msgstr "Der entfernte Server akzeptiert keine AuftrÃ¤ge. Ein mÃ¶glicher Fehler ist, dass der Drucker nicht freigegeben ist."
+ 
+ #: ../system-config-printer.py:1638
+ msgid "Error"
+@@ -284,9 +294,9 @@ msgid "This is the default printer"
+ msgstr "Dies ist der Standard-Drucker"
+ 
+ #: ../system-config-printer.py:1708
+-#, fuzzy, python-format
++#, python-format
+ msgid "Default printer is %s"
+-msgstr "Standarddrucker"
++msgstr "Der Standard-Drucker ist %s"
+ 
+ #: ../system-config-printer.py:1711
+ msgid "No default printer set."
+@@ -296,7 +306,8 @@ msgstr "Es wurde kein Standard-Drucker e
+ msgid "Cancel Tests"
+ msgstr "Tests abbrechen"
+ 
+-#: ../system-config-printer.py:1801 ../system-config-printer.glade.h:197
++#: ../system-config-printer.py:1801
++#: ../system-config-printer.glade.h:197
+ msgid "Print Test Page"
+ msgstr "Testseite drucken"
+ 
+@@ -310,11 +321,13 @@ msgstr "MÃ¶chten Sie den Drucker %s wirk
+ msgid "Really delete class %s?"
+ msgstr "MÃ¶chten Sie die Klasse %s wirklich lÃ¶schen?"
+ 
+-#: ../system-config-printer.py:2113 ../system-config-printer.glade.h:147
++#: ../system-config-printer.py:2113
++#: ../system-config-printer.glade.h:147
+ msgid "New Printer"
+ msgstr "Neuer Drucker"
+ 
+-#: ../system-config-printer.py:2128 ../system-config-printer.glade.h:146
++#: ../system-config-printer.py:2128
++#: ../system-config-printer.glade.h:146
+ msgid "New Class"
+ msgstr "Neue Klasse"
+ 
+@@ -363,25 +376,16 @@ msgid "A printer connected to a USB port
+ msgstr "Ein am USB-Port angeschlossener Drucker."
+ 
+ #: ../system-config-printer.py:2946
+-msgid ""
+-"HPLIP software driving a printer, or the printer function of a multi-"
+-"function device."
+-msgstr ""
+-"HPLIP-Software, die einen Drucker betreibt oder die Druckerfunktion eines "
+-"multifunktionalen GerÃ¤ts."
++msgid "HPLIP software driving a printer, or the printer function of a multi-function device."
++msgstr "HPLIP-Software, die einen Drucker betreibt oder die Druckerfunktion eines multifunktionalen GerÃ¤ts."
+ 
+ #: ../system-config-printer.py:2949
+-msgid ""
+-"HPLIP software driving a fax machine, or the fax function of a multi-"
+-"function device."
+-msgstr ""
+-"HPLIP-Software, die eine Fax-Maschine betreibt oder die Fax-Funktion eines "
+-"multifunktionalen GerÃ¤ts."
++msgid "HPLIP software driving a fax machine, or the fax function of a multi-function device."
++msgstr "HPLIP-Software, die eine Fax-Maschine betreibt oder die Fax-Funktion eines multifunktionalen GerÃ¤ts."
+ 
+ #: ../system-config-printer.py:2952
+ msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
+-msgstr ""
+-"Lokaler Drucker, der vom Hardware Abstraction Layer (HAL) erkannt wurde."
++msgstr "Lokaler Drucker, der vom Hardware Abstraction Layer (HAL) erkannt wurde."
+ 
+ #: ../system-config-printer.py:3185
+ msgid " (recommended)"
+@@ -395,14 +399,16 @@ msgstr "PPD wird von foomatic erstellt."
+ #: ../system-config-printer.py:3267
+ #, python-format
+ msgid "Going to create a new class %s."
+-msgstr ""
++msgstr "Erstelle neue Klasse %s."
+ 
+ #: ../system-config-printer.py:3285
+-#, fuzzy, python-format
++#, python-format
+ msgid ""
+ "Going to create a new printer %s at\n"
+ "%s.\n"
+-msgstr "Neue Druckergruppe erstellen"
++msgstr ""
++"Erstelle neuen Drucker %s bei\n"
++"%s.\n"
+ 
+ #. Foomatic database problem of some sort.
+ #: ../system-config-printer.py:3309
+@@ -446,9 +452,7 @@ msgstr "Treiber installieren"
+ #: ../system-config-printer.py:3651
+ #, python-format
+ msgid "Printer '%s' requires the %s package but it is not currently installed."
+-msgstr ""
+-"Der Drucker '%s' benÃ¶tigt das Paket %s, welches derzeit nicht installiert "
+-"ist."
++msgstr "Der Drucker '%s' benÃ¶tigt das Paket %s, welches derzeit nicht installiert ist."
+ 
+ #: ../system-config-printer.py:3658
+ msgid "Missing driver"
+@@ -456,12 +460,8 @@ msgstr "Fehlender Treiber"
+ 
+ #: ../system-config-printer.py:3659
+ #, python-format
+-msgid ""
+-"Printer '%s' requires the '%s' program but it is not currently installed.  "
+-"Please install it before using this printer."
+-msgstr ""
+-"Der Drucker '%s' benÃ¶tigt das Paket '%s', welches derzeit nicht installiert "
+-"ist. Bitte installieren Sie es, bevor Sie den Drucker verwenden."
++msgid "Printer '%s' requires the '%s' program but it is not currently installed.  Please install it before using this printer."
++msgstr "Der Drucker '%s' benÃ¶tigt das Paket '%s', welches derzeit nicht installiert ist. Bitte installieren Sie es, bevor Sie den Drucker verwenden."
+ 
+ #: ../system-config-printer.glade.h:1
+ msgid " "
+@@ -469,7 +469,7 @@ msgstr " "
+ 
+ #: ../system-config-printer.glade.h:2
+ msgid " PPD "
+-msgstr ""
++msgstr " PPD "
+ 
+ #: ../system-config-printer.glade.h:3
+ msgid ""
+@@ -488,9 +488,8 @@ msgstr ""
+ "16"
+ 
+ #: ../system-config-printer.glade.h:9
+-#, fuzzy
+ msgid "<b>Authentication</b>"
+-msgstr "<b>Beschreibung</b>"
++msgstr "<b>Authentifizierung</b>"
+ 
+ #: ../system-config-printer.glade.h:10
+ msgid "<b>Banner</b>"
+@@ -502,21 +501,19 @@ msgstr "<b>Server-Grundeinstellungen</b>
+ 
+ #: ../system-config-printer.glade.h:12
+ msgid "<b>Comment about the Driver</b>"
+-msgstr ""
++msgstr "<b>Kommentar zum Treiber</b>"
+ 
+ #: ../system-config-printer.glade.h:13
+-#, fuzzy
+ msgid "<b>Comment about the Printer</b>"
+-msgstr "<b>Ort des Netzwerkdruckers</b>"
++msgstr "<b>Kommentar zum Drucker</b>"
+ 
+ #: ../system-config-printer.glade.h:14
+ msgid "<b>Common Options</b>"
+ msgstr "<b>Allgemeine Optionen</b>"
+ 
+ #: ../system-config-printer.glade.h:15
+-#, fuzzy
+ msgid "<b>Default Printer</b>"
+-msgstr "Standarddrucker"
++msgstr "<b>Standarddrucker</b>"
+ 
+ #: ../system-config-printer.glade.h:16
+ msgid "<b>Description</b>"
+@@ -536,7 +533,7 @@ msgstr "<b>Bildoptionen</b>"
+ 
+ #: ../system-config-printer.glade.h:20
+ msgid "<b>Information about the PPD</b>"
+-msgstr ""
++msgstr "<b>Informationen zu PPD</b>"
+ 
+ #: ../system-config-printer.glade.h:21
+ msgid "<b>Location of the LPD network printer</b>"
+@@ -610,10 +607,10 @@ msgid ""
+ msgstr ""
+ "<span weight=\"bold\" size=\"larger\">Ã„nderungen anwenden?</span>\n"
+ "\n"
+-"Jegliche von Ihnen gemachte Ã„nderungen gehen verloren, wenn Sie sie nicht "
+-"anwenden."
++"Jegliche von Ihnen gemachte Ã„nderungen gehen verloren, wenn Sie sie nicht anwenden."
+ 
+-#: ../system-config-printer.glade.h:40 ../applet.glade.h:1
++#: ../system-config-printer.glade.h:40
++#: ../applet.glade.h:1
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">Password required</span>\n"
+ "\n"
+@@ -622,21 +619,18 @@ msgstr ""
+ "\n"
+ 
+ #: ../system-config-printer.glade.h:43
+-#, fuzzy
+ msgid "About"
+-msgstr "Abgebrochen"
++msgstr "Ãœber"
+ 
+ #: ../system-config-printer.glade.h:44
+-#, fuzzy
+ msgid "About System-Config-Printer"
+-msgstr "System-Config-Printer"
++msgstr "Ãœber System-Config-Printer"
+ 
+ #: ../system-config-printer.glade.h:45
+ msgid "Accepting jobs"
+ msgstr "Akzeptiere DruckauftrÃ¤ge"
+ 
+ #: ../system-config-printer.glade.h:46
+-#, fuzzy
+ msgid "Access control"
+ msgstr "Zugriffskontrolle"
+ 
+@@ -658,18 +652,15 @@ msgstr "Remote-Administration erlauben"
+ 
+ #: ../system-config-printer.glade.h:51
+ msgid "Allow users to cancel any job (not just their own)"
+-msgstr ""
+-"Benutzern das LÃ¶schen jeglicher DruckauftrÃ¤ge erlauben (nicht nur die "
+-"eigenen)"
++msgstr "Benutzern das LÃ¶schen jeglicher DruckauftrÃ¤ge erlauben (nicht nur die eigenen)"
+ 
+ #: ../system-config-printer.glade.h:52
+ msgid "Apply"
+-msgstr ""
++msgstr "Anwenden"
+ 
+ #: ../system-config-printer.glade.h:53
+-#, fuzzy
+ msgid "Authors"
+-msgstr "Andere"
++msgstr "Autoren"
+ 
+ #: ../system-config-printer.glade.h:54
+ msgid "Baud Rate"
+@@ -688,9 +679,8 @@ msgid "CUPS server:"
+ msgstr "CUPS-Server:"
+ 
+ #: ../system-config-printer.glade.h:58
+-#, fuzzy
+ msgid "Change PPD"
+-msgstr "Treiber Ã¤ndern"
++msgstr "PPD Ã¤ndern"
+ 
+ #: ../system-config-printer.glade.h:59
+ msgid "Change..."
+@@ -701,18 +691,16 @@ msgid "Characters per inch:"
+ msgstr "Buchstaben pro Zoll:"
+ 
+ #: ../system-config-printer.glade.h:61
+-#, fuzzy
+ msgid "Class Members"
+-msgstr "Berechtigte"
++msgstr "Mitglieder der Klasse"
+ 
+ #: ../system-config-printer.glade.h:62
+ msgid "Columns:"
+ msgstr "Spalten:"
+ 
+ #: ../system-config-printer.glade.h:63
+-#, fuzzy
+ msgid "Comments: "
+-msgstr "Kommentar"
++msgstr "Kommentare: "
+ 
+ #: ../system-config-printer.glade.h:64
+ msgid "Connect to CUPS server"
+@@ -748,9 +736,8 @@ msgid "Copy this printer queue"
+ msgstr "Diese Druckerwarteschlange kopieren"
+ 
+ #: ../system-config-printer.glade.h:74
+-#, fuzzy
+ msgid "Copyright"
+-msgstr "Drucker kopieren"
++msgstr "Copyright"
+ 
+ #: ../system-config-printer.glade.h:75
+ msgid "Create a new printer group"
+@@ -835,9 +822,8 @@ msgid "Description:"
+ msgstr "Beschreibung:"
+ 
+ #: ../system-config-printer.glade.h:102
+-#, fuzzy
+ msgid "Device"
+-msgstr "GerÃ¤te"
++msgstr "GerÃ¤t"
+ 
+ #: ../system-config-printer.glade.h:103
+ msgid "Device URI"
+@@ -856,7 +842,6 @@ msgid "DirectJet"
+ msgstr "DirectJet"
+ 
+ #: ../system-config-printer.glade.h:107
+-#, fuzzy
+ msgid "Driver"
+ msgstr "Treiber"
+ 
+@@ -897,9 +882,8 @@ msgid "Hold until:"
+ msgstr "Angehalten bis:"
+ 
+ #: ../system-config-printer.glade.h:117
+-#, fuzzy
+ msgid "Hostname"
+-msgstr "Host:"
++msgstr "Rechnername"
+ 
+ #: ../system-config-printer.glade.h:118
+ msgid "Hue adjustment:"
+@@ -907,8 +891,7 @@ msgstr "Anpassung des Farbtons:"
+ 
+ #: ../system-config-printer.glade.h:119
+ msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
+-msgstr ""
+-"Normal lesbare Beschreibung, wie zum Beispiel \"HP LaserJet mit Duplex\""
++msgstr "Normal lesbare Beschreibung, wie zum Beispiel \"HP LaserJet mit Duplex\""
+ 
+ #: ../system-config-printer.glade.h:120
+ msgid "Human-readable location such as \"Lab 1\""
+@@ -963,21 +946,16 @@ msgid "Location:"
+ msgstr "Ort:"
+ 
+ #: ../system-config-printer.glade.h:137
+-#, fuzzy
+ msgid "Make Default Printer"
+-msgstr "Standarddrucker"
++msgstr "Mache zu Standarddrucker"
+ 
+ #: ../system-config-printer.glade.h:138
+ msgid "Make and Model:"
+ msgstr "Marke und Modell:"
+ 
+ #: ../system-config-printer.glade.h:139
+-#, fuzzy
+ msgid "May contain any printable characters except \"/\", \"#\", and space"
+-msgstr ""
+-"Diese Dokument enthÃ¤lt wahrscheinlich nicht druckbare Zeichen auÃŸer\n"
+-" \"/\", \"#\" und Leerzeichen. Der Name muss auf der lokalen Maschine\n"
+-"eindeutig sein!"
++msgstr "Diese Dokument enthÃ¤lt wahrscheinlich nicht druckbare Zeichen ausser \"/\", \"#\" und Leerzeichen."
+ 
+ #: ../system-config-printer.glade.h:140
+ msgid "Media:"
+@@ -997,7 +975,7 @@ msgstr "Mehr"
+ 
+ #: ../system-config-printer.glade.h:144
+ msgid "Name"
+-msgstr ""
++msgstr "Name"
+ 
+ #: ../system-config-printer.glade.h:145
+ msgid "New Clas_s"
+@@ -1090,9 +1068,8 @@ msgid "Orientation:"
+ msgstr "Ausrichtung:"
+ 
+ #: ../system-config-printer.glade.h:183
+-#, fuzzy
+ msgid "PPD"
+-msgstr "IPP"
++msgstr "PPD"
+ 
+ #: ../system-config-printer.glade.h:184
+ msgid "Pages per side layout:"
+@@ -1106,7 +1083,8 @@ msgstr "Seiten pro Seite:"
+ msgid "Parity"
+ msgstr "ParitÃ¤t"
+ 
+-#: ../system-config-printer.glade.h:187 ../applet.glade.h:5
++#: ../system-config-printer.glade.h:187
++#: ../applet.glade.h:5
+ msgid "Password:"
+ msgstr "Passwort:"
+ 
+@@ -1119,9 +1097,8 @@ msgid "Policies"
+ msgstr "Richtlinien"
+ 
+ #: ../system-config-printer.glade.h:190
+-#, fuzzy
+ msgid "Port number"
+-msgstr "Portnummer:"
++msgstr "Portnummer"
+ 
+ #: ../system-config-printer.glade.h:191
+ msgid ""
+@@ -1136,14 +1113,8 @@ msgstr ""
+ "Invertiertes Hochformat (180Â°)"
+ 
+ #: ../system-config-printer.glade.h:195
+-msgid ""
+-"PostScript Printer Description (PPD) files can often found on the driver "
+-"disk that comes with the printer. For PostScript printers they are often "
+-"part of the Windows<sup>Â®</sup> driver."
+-msgstr ""
+-"PostScript Printer Description (PPD) Dateien sind hÃ¤ufig auf der Treiber-CD "
+-"zu finden, die dem Drucker beiliegt. FÃ¼r PostScript-Drucker sind sie hÃ¤ufig "
+-"Teil der Windows<sup>Â®</sup>-Treiber."
++msgid "PostScript Printer Description (PPD) files can often found on the driver disk that comes with the printer. For PostScript printers they are often part of the Windows<sup>Â®</sup> driver."
++msgstr "PostScript Printer Description (PPD) Dateien sind hÃ¤ufig auf der Treiber-CD zu finden, die dem Drucker beiliegt. FÃ¼r PostScript-Drucker sind sie hÃ¤ufig Teil der Windows<sup>Â®</sup>-Treiber."
+ 
+ #: ../system-config-printer.glade.h:196
+ msgid "Pretty print"
+@@ -1154,18 +1125,16 @@ msgid "Printer State:"
+ msgstr "Druckerstatus:"
+ 
+ #: ../system-config-printer.glade.h:201
+-#, fuzzy
+ msgid "Printername"
+-msgstr "Drucker"
++msgstr "Druckername"
+ 
+ #: ../system-config-printer.glade.h:202
+ msgid "Probe"
+ msgstr "Erkennung"
+ 
+ #: ../system-config-printer.glade.h:203
+-#, fuzzy
+ msgid "Provide PPD file"
+-msgstr "PPD-Datei zur VerfÃ¼gung stellen"
++msgstr "PPD-Datei erstellen"
+ 
+ #: ../system-config-printer.glade.h:204
+ msgid "Refresh the list of printer queues"
+@@ -1216,7 +1185,6 @@ msgid "Select A File"
+ msgstr "WÃ¤hlen Sie eine Datei"
+ 
+ #: ../system-config-printer.glade.h:216
+-#, fuzzy
+ msgid "Select Printer from database"
+ msgstr "Drucker aus Datenbank auswÃ¤hlen"
+ 
+@@ -1245,14 +1213,8 @@ msgid "Sides:"
+ msgstr "Seiten:"
+ 
+ #: ../system-config-printer.glade.h:223
+-msgid ""
+-"Specify the default job options for this printer.  Jobs arriving at this "
+-"print server will have these options added if they are not already set by "
+-"the application."
+-msgstr ""
+-"Geben Sie die standardmÃ¤ÃŸigen Job-Optionen fÃ¼r diesen Drucker an.  Jobs, die "
+-"an diesen Drucker gerichtet werden, werden diese Optionen hinzugefÃ¼gt, falls "
+-"sie nicht bereits von der Anwendung gesetzt wurden."
++msgid "Specify the default job options for this printer.  Jobs arriving at this print server will have these options added if they are not already set by the application."
++msgstr "Geben Sie die standardmÃ¤ÃŸigen Job-Optionen fÃ¼r diesen Drucker an.  Jobs, die an diesen Drucker gerichtet werden, werden diese Optionen hinzugefÃ¼gt, falls sie nicht bereits von der Anwendung gesetzt wurden."
+ 
+ #: ../system-config-printer.glade.h:224
+ msgid "Starting Banner:"
+@@ -1263,49 +1225,25 @@ msgid "System-Config-Printer"
+ msgstr "System-Config-Printer"
+ 
+ #: ../system-config-printer.glade.h:227
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "System-Config-Printer %s"
+-msgstr "System-Config-Printer"
++msgstr "System-Config-Printer %s"
+ 
+ #: ../system-config-printer.glade.h:228
+-msgid ""
+-"The foomatic printer database contains various manufacturer provided "
+-"PostScript Printer Description (PPD) files and also can generate PPD files "
+-"for a large number of (non PostScript) printers. But in general manufacturer "
+-"provided PPD files provide better access to the specific features of the "
+-"printer."
+-msgstr ""
+-"Die foomatic-Druckerdatenbank beinhaltet verschiedene PostScript Printer "
+-"Description (PPD) Dateien, die von Herstellern zur VerfÃ¼gung gestellt "
+-"werden. Sie kann weiterhin PPD-Dateien fÃ¼r eine groÃŸe Anzahl von (Nicht-"
+-"PostScript-)Druckern generieren. Allerdings bieten die von den Herstellern "
+-"zur VerfÃ¼gung gestellten Dateien im Allgemeinen einen besseren Zugang zu "
+-"bestimmten Funktionen des Druckers."
++msgid "The foomatic printer database contains various manufacturer provided PostScript Printer Description (PPD) files and also can generate PPD files for a large number of (non PostScript) printers. But in general manufacturer provided PPD files provide better access to the specific features of the printer."
++msgstr "Die foomatic-Druckerdatenbank beinhaltet verschiedene PostScript Printer Description (PPD) Dateien, die von Herstellern zur VerfÃ¼gung gestellt werden. Sie kann weiterhin PPD-Dateien fÃ¼r eine groÃŸe Anzahl von (Nicht-PostScript-)Druckern generieren. Allerdings bieten die von den Herstellern zur VerfÃ¼gung gestellten Dateien im Allgemeinen einen besseren Zugang zu bestimmten Funktionen des Druckers."
+ 
+ #: ../system-config-printer.glade.h:229
+-msgid ""
+-"This is done by assuming that options with the same name do have the same "
+-"meaning. Settings of options that are not present in the new PPD will be "
+-"lost and options only present in the new PPD will be set to default."
+-msgstr ""
+-"Dies wird auf der Annahme durchgefÃ¼hrt, dass Optionen mit gleichen Namen die "
+-"gleiche Bedeutung haben. Einstellungen von Optionen, die nicht im neuen PPD "
+-"vorhanden sind, gehen verloren und nur Optionen, die im neuen PPD vorhanden "
+-"sind, werden als Standard gesetzt."
++msgid "This is done by assuming that options with the same name do have the same meaning. Settings of options that are not present in the new PPD will be lost and options only present in the new PPD will be set to default."
++msgstr "Dies wird auf der Annahme durchgefÃ¼hrt, dass Optionen mit gleichen Namen die gleiche Bedeutung haben. Einstellungen von Optionen, die nicht im neuen PPD vorhanden sind, gehen verloren und nur Optionen, die im neuen PPD vorhanden sind, werden als Standard gesetzt."
+ 
+ #: ../system-config-printer.glade.h:230
+-msgid ""
+-"This way all current option settings will be lost. The default settings of "
+-"the new PPD will be used. "
+-msgstr ""
+-"Auf diesem Weg gehen alle derzeitigen Einstellungsoptionen verloren. Die "
+-"Voreinstellungen der neuen PPD werden verwendet."
++msgid "This way all current option settings will be lost. The default settings of the new PPD will be used. "
++msgstr "Auf diesem Weg gehen alle derzeitigen Einstellungsoptionen verloren. Die Voreinstellungen der neuen PPD werden verwendet."
+ 
+ #: ../system-config-printer.glade.h:231
+ msgid "To add a new option, enter its name in the box below and click to add."
+-msgstr ""
+-"Um eine neue Option hinzuzufÃ¼gen, geben Sie den Namen im unten aufgefÃ¼hrten "
+-"Kasten an und klicken, um sie hinzuzufÃ¼gen."
++msgstr "Um eine neue Option hinzuzufÃ¼gen, geben Sie den Namen im unten aufgefÃ¼hrten Kasten an und klicken, um sie hinzuzufÃ¼gen."
+ 
+ #: ../system-config-printer.glade.h:232
+ msgid "Top margin:"
+@@ -1339,7 +1277,8 @@ msgstr "Nicht anwen_den"
+ msgid "_Edit"
+ msgstr "B_earbeiten"
+ 
+-#: ../system-config-printer.glade.h:240 ../applet.glade.h:10
++#: ../system-config-printer.glade.h:240
++#: ../applet.glade.h:10
+ msgid "_File"
+ msgstr "_Datei"
+ 
+@@ -1584,19 +1523,17 @@ msgid "Missing printer driver"
+ msgstr "Fehlender Druckertreiber"
+ 
+ #: ../applet.py:1032
+-#, fuzzy
+ msgid "Install printer driver"
+-msgstr "Treiber installieren"
++msgstr "Installiere Druckertreiber"
+ 
+ #: ../applet.py:1033
+ #, python-format
+ msgid "`%s' requires driver installation: %s."
+-msgstr ""
++msgstr "`%s' benÃ¶tigt eine Treiber-Installation: %s."
+ 
+ #: ../applet.py:1036
+-#, fuzzy
+ msgid "Install"
+-msgstr "_Installieren"
++msgstr "Installieren"
+ 
+ #: ../applet.py:1039
+ #, python-format
+@@ -1675,87 +1612,61 @@ msgstr "Standarddrucker wÃ¤hlen"
+ 
+ #~ msgid "3"
+ #~ msgstr "3"
+-
+ #~ msgid "Automatic rotation"
+ #~ msgstr "Automatische Rotation"
+-
+ #~ msgid "Maintenance command submitted as job %d"
+ #~ msgstr "Befehl zur Wartung Ã¼bertragen als Auftrag %d"
+-
+ #~ msgid "Option '%s' has value '%s' and cannot be edited."
+ #~ msgstr "Option '%s' hat den Wert '%s' und kann nicht bearbeitet werden."
+-
+ #~ msgid "Queue"
+ #~ msgstr "Warteschlange"
+-
+ #~ msgid "Scanning..."
+ #~ msgstr "Abfrage..."
+-
+ #~ msgid "It is not possible to obtain a list of queues from this host."
+ #~ msgstr ""
+ #~ "Von diesem Host kann keine Liste mit Warteschlangen abgerufen werden."
+-
+ #~ msgid "No queues"
+ #~ msgstr "Keine Warteschlangen"
+-
+ #~ msgid "There are no queues available."
+ #~ msgstr "Es sind keine Warteschlangen verfÃ¼gbar."
+-
+ #~ msgid "No Installable Options"
+ #~ msgstr "Keine installierbaren Optionen"
+-
+ #~ msgid "<b>IPP Printer</b>"
+ #~ msgstr "<b>IPP-Drucker</b>"
+-
+ #~ msgid "<b>Installed Options</b>"
+ #~ msgstr "<b>Installierte Optionen</b>"
+-
+ #~ msgid "<b>Tests and Maintenance</b>"
+ #~ msgstr "<b>Tests und Wartung</b>"
+-
+ #~ msgid "Authentication required"
+ #~ msgstr "Authentifizierung erforderlich"
+-
+ #~ msgid "Browse..."
+ #~ msgstr "Durchsuchen..."
+-
+ #~ msgid "Clean Print Heads"
+ #~ msgstr "DruckkÃ¶pfe sÃ¤ubern"
+-
+ #~ msgid "Comments..."
+ #~ msgstr "Kommentare..."
+-
+ #~ msgid "Default Printer:"
+ #~ msgstr "Standarddrucker:"
+-
+ #~ msgid "Find _Queue..."
+ #~ msgstr "_Warteschlange finden..."
+-
+ #~ msgid "IPP Browser"
+ #~ msgstr "IPP-Browser"
+-
+ #~ msgid "Installed Options"
+ #~ msgstr "Installierte Optionen"
+-
+ #~ msgid "Make Default"
+ #~ msgstr "Standard definieren"
+-
+ #~ msgid "Print Self-Test Page"
+ #~ msgstr "Testseite drucken"
+-
+ #~ msgid "Queue:"
+ #~ msgstr "Warteschlange:"
+-
+ #~ msgid "SMB Browser"
+ #~ msgstr "SMB-Browser"
+-
+ #~ msgid ""
+ #~ "This driver supports additional hardware that may be installed in the "
+ #~ "printer."
+ #~ msgstr ""
+ #~ "Dieser Treiber unterstÃ¼tzt zusÃ¤tzliche Hardware, die ggf. in diesem "
+ #~ "Drucker installiert wird."
+-
+ #~ msgid ""
+ #~ "This program is free software; you can redistribute it and/or modify it "
+ #~ "under the terms of the GNU General Public License as published by the "
+@@ -1784,9 +1695,8 @@ msgstr "Standarddrucker wÃ¤hlen"
+ #~ "Sie sollten ein Exemplar der GNU General Public License zusammen mit "
+ #~ "diesem Programm erhalten haben. Falls nicht, kontaktieren Sie die Free "
+ #~ "Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+-
+ #~ msgid "URI:"
+ #~ msgstr "URI:"
+-
+ #~ msgid "translator-credits"
+ #~ msgstr "N/A"
++
+diff -up system-config-printer-0.7.74.10/po/pt_BR.po.0.7.74.x system-config-printer-0.7.74.10/po/pt_BR.po
+--- system-config-printer-0.7.74.10/po/pt_BR.po.0.7.74.x	2008-01-24 10:08:46.000000000 +0000
++++ system-config-printer-0.7.74.10/po/pt_BR.po	2008-02-02 11:10:52.000000000 +0000
+@@ -16,7 +16,7 @@ msgstr ""
+ "Project-Id-Version: pt_BR\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+ "POT-Creation-Date: 2008-01-16 17:31+0000\n"
+-"PO-Revision-Date: 2007-11-18 00:31-0300\n"
++"PO-Revision-Date: 2008-01-28 16:09-0300\n"
+ "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
+ "Language-Team: Brazilian Portuguese <fedora-trans-pt_BR at redhat.com>\n"
+ "MIME-Version: 1.0\n"
+@@ -30,7 +30,8 @@ msgstr ""
+ msgid "Idle"
+ msgstr "Ociosa"
+ 
+-#: ../cupshelpers.py:28 ../applet.py:731
++#: ../cupshelpers.py:28
++#: ../applet.py:731
+ msgid "Processing"
+ msgstr "Processando"
+ 
+@@ -38,28 +39,35 @@ msgstr "Processando"
+ msgid "Busy"
+ msgstr "Ocupada"
+ 
+-#: ../cupshelpers.py:30 ../applet.py:732
++#: ../cupshelpers.py:30
++#: ../applet.py:732
+ msgid "Stopped"
+ msgstr "Parada"
+ 
+-#: ../cupshelpers.py:47 ../applet.py:741
++#: ../cupshelpers.py:47
++#: ../applet.py:741
+ msgid "Unknown"
+ msgstr "Desconhecido"
+ 
+-#: ../my-default-printer.py:125 ../my-default-printer.desktop.in.h:1
++#: ../my-default-printer.py:125
++#: ../my-default-printer.desktop.in.h:1
+ msgid "Default Printer"
+ msgstr "Impressora PadrÃ£o"
+ 
+-#: ../my-default-printer.py:129 ../my-default-printer.py:160
++#: ../my-default-printer.py:129
++#: ../my-default-printer.py:160
+ msgid "_Use System Default"
+ msgstr "_Utilizar PadrÃ£o do Sistema"
+ 
+-#: ../my-default-printer.py:130 ../my-default-printer.py:162
++#: ../my-default-printer.py:130
++#: ../my-default-printer.py:162
+ msgid "_Set Default"
+ msgstr "_Definir Como PadrÃ£o"
+ 
+-#: ../my-default-printer.py:140 ../system-config-printer.glade.h:198
+-#: ../applet.py:186 ../applet.py:226
++#: ../my-default-printer.py:140
++#: ../system-config-printer.glade.h:198
++#: ../applet.py:186
++#: ../applet.py:226
+ msgid "Printer"
+ msgstr "Impressora"
+ 
+@@ -79,11 +87,13 @@ msgstr "Copyright 2006, 2007 Red Hat, In
+ msgid "Server Settings"
+ msgstr "ConfiguraÃ§Ãµes do Servidor"
+ 
+-#: ../system-config-printer.py:297 ../system-config-printer.py:299
++#: ../system-config-printer.py:297
++#: ../system-config-printer.py:299
+ msgid "Members of this class"
+ msgstr "Membros desta classe"
+ 
+-#: ../system-config-printer.py:298 ../system-config-printer.py:300
++#: ../system-config-printer.py:298
++#: ../system-config-printer.py:300
+ msgid "Others"
+ msgstr "Outros"
+ 
+@@ -120,7 +130,8 @@ msgstr "Compartilhamento"
+ msgid "Comment"
+ msgstr "ComentÃ¡rio"
+ 
+-#: ../system-config-printer.py:561 ../system-config-printer.py:2493
++#: ../system-config-printer.py:561
++#: ../system-config-printer.py:2493
+ msgid "Searching"
+ msgstr "Pesquisando"
+ 
+@@ -138,7 +149,8 @@ msgstr "ConfiguraÃ§Ã£o da impressora - %
+ msgid "Connected to %s"
+ msgstr "Conectado a %s"
+ 
+-#: ../system-config-printer.py:610 ../system-config-printer.py:1301
++#: ../system-config-printer.py:610
++#: ../system-config-printer.py:1301
+ msgid "Not connected"
+ msgstr "NÃ£o conectado"
+ 
+@@ -167,11 +179,13 @@ msgstr ""
+ "Conectando ao servidor:\n"
+ "%s"
+ 
+-#: ../system-config-printer.py:1230 ../system-config-printer.glade.h:122
++#: ../system-config-printer.py:1230
++#: ../system-config-printer.glade.h:122
+ msgid "Installable Options"
+ msgstr "OpÃ§Ãµes de InstalaÃ§Ã£o"
+ 
+-#: ../system-config-printer.py:1231 ../system-config-printer.glade.h:199
++#: ../system-config-printer.py:1231
++#: ../system-config-printer.glade.h:199
+ msgid "Printer Options"
+ msgstr "OpÃ§Ãµes da Impressora"
+ 
+@@ -185,32 +199,32 @@ msgstr ""
+ "As alteraÃ§Ãµes somente poderÃ£o ser aplicadas\n"
+ "depois que estes conflitos forem resolvidos."
+ 
+-#: ../system-config-printer.py:1269 ../system-config-printer.py:1285
++#: ../system-config-printer.py:1269
++#: ../system-config-printer.py:1285
+ #: ../applet.py:349
+ msgid "Not authorized"
+ msgstr "NÃ£o autorizado"
+ 
+-#: ../system-config-printer.py:1270 ../applet.py:350
++#: ../system-config-printer.py:1270
++#: ../applet.py:350
+ msgid "The password may be incorrect."
+ msgstr "A senha pode estar incorreta."
+ 
+-#: ../system-config-printer.py:1273 ../system-config-printer.py:1306
++#: ../system-config-printer.py:1273
++#: ../system-config-printer.py:1306
+ #: ../applet.py:353
+ msgid "CUPS server error"
+ msgstr "Erro no servidor CUPS"
+ 
+-#: ../system-config-printer.py:1274 ../applet.py:354
++#: ../system-config-printer.py:1274
++#: ../applet.py:354
+ #, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+ msgstr "Houve um erro durante a operaÃ§Ã£o do CUPS: '%s'."
+ 
+ #: ../system-config-printer.py:1286
+-msgid ""
+-"The password may be incorrect, or the server may be configured to deny "
+-"remote administration."
+-msgstr ""
+-"A senha pode estar incorreta ou o servidor pode estar configurado para nÃ£o "
+-"permitir administraÃ§Ã£o remota."
++msgid "The password may be incorrect, or the server may be configured to deny remote administration."
++msgstr "A senha pode estar incorreta ou o servidor pode estar configurado para nÃ£o permitir administraÃ§Ã£o remota."
+ 
+ #: ../system-config-printer.py:1291
+ msgid "Bad request"
+@@ -264,12 +278,8 @@ msgid "Not possible"
+ msgstr "ImpossÃvel"
+ 
+ #: ../system-config-printer.py:1559
+-msgid ""
+-"The remote server did not accept the print job, most likely because the "
+-"printer is not shared."
+-msgstr ""
+-"O servidor remoto nÃ£o pÃ´de aceitar o trabalho de impressÃ£o, provavelmente a "
+-"impressora nÃ£o estÃ¡ compartilhada."
++msgid "The remote server did not accept the print job, most likely because the printer is not shared."
++msgstr "O servidor remoto nÃ£o pÃ´de aceitar o trabalho de impressÃ£o, provavelmente a impressora nÃ£o estÃ¡ compartilhada."
+ 
+ #: ../system-config-printer.py:1638
+ msgid "Error"
+@@ -296,7 +306,8 @@ msgstr "Impressora padrÃ£o nÃ£o definida
+ msgid "Cancel Tests"
+ msgstr "Cancelar Testes"
+ 
+-#: ../system-config-printer.py:1801 ../system-config-printer.glade.h:197
++#: ../system-config-printer.py:1801
++#: ../system-config-printer.glade.h:197
+ msgid "Print Test Page"
+ msgstr "Imprimir PÃ¡gina de Teste"
+ 
+@@ -310,11 +321,13 @@ msgstr "Deseja realmente excluir a impre
+ msgid "Really delete class %s?"
+ msgstr "Deseja realmente excluir a classe %s?"
+ 
+-#: ../system-config-printer.py:2113 ../system-config-printer.glade.h:147
++#: ../system-config-printer.py:2113
++#: ../system-config-printer.glade.h:147
+ msgid "New Printer"
+ msgstr "Nova Impressora"
+ 
+-#: ../system-config-printer.py:2128 ../system-config-printer.glade.h:146
++#: ../system-config-printer.py:2128
++#: ../system-config-printer.glade.h:146
+ msgid "New Class"
+ msgstr "Nova Classe"
+ 
+@@ -363,20 +376,12 @@ msgid "A printer connected to a USB port
+ msgstr "Uma impressora conectada Ã  porta USB."
+ 
+ #: ../system-config-printer.py:2946
+-msgid ""
+-"HPLIP software driving a printer, or the printer function of a multi-"
+-"function device."
+-msgstr ""
+-"O programa HPLIP controlando uma impressora ou a funÃ§Ã£o de impressÃ£o de um "
+-"dispositivo multifuncional."
++msgid "HPLIP software driving a printer, or the printer function of a multi-function device."
++msgstr "O programa HPLIP controlando uma impressora ou a funÃ§Ã£o de impressÃ£o de um dispositivo multifuncional."
+ 
+ #: ../system-config-printer.py:2949
+-msgid ""
+-"HPLIP software driving a fax machine, or the fax function of a multi-"
+-"function device."
+-msgstr ""
+-"O software HPLIP controlando um aparelho de fax ou a funÃ§Ã£o de fax de um "
+-"dispositivo multifuncional."
++msgid "HPLIP software driving a fax machine, or the fax function of a multi-function device."
++msgstr "O software HPLIP controlando um aparelho de fax ou a funÃ§Ã£o de fax de um dispositivo multifuncional."
+ 
+ #: ../system-config-printer.py:2952
+ msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
+@@ -455,12 +460,8 @@ msgstr "Driver faltando"
+ 
+ #: ../system-config-printer.py:3659
+ #, python-format
+-msgid ""
+-"Printer '%s' requires the '%s' program but it is not currently installed.  "
+-"Please install it before using this printer."
+-msgstr ""
+-"A impressora '%s' requer o programa '%s', mas ele nÃ£o estÃ¡ instalado.  Por "
+-"favor, instale-o antes de usar a impressora."
++msgid "Printer '%s' requires the '%s' program but it is not currently installed.  Please install it before using this printer."
++msgstr "A impressora '%s' requer o programa '%s', mas ele nÃ£o estÃ¡ instalado.  Por favor, instale-o antes de usar a impressora."
+ 
+ #: ../system-config-printer.glade.h:1
+ msgid " "
+@@ -608,7 +609,8 @@ msgstr ""
+ "\n"
+ "Todas as alteraÃ§Ãµes que vocÃª fez serÃ£o perdidas a menos que vocÃª aplique-as."
+ 
+-#: ../system-config-printer.glade.h:40 ../applet.glade.h:1
++#: ../system-config-printer.glade.h:40
++#: ../applet.glade.h:1
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">Password required</span>\n"
+ "\n"
+@@ -650,9 +652,7 @@ msgstr "Permitir administraÃ§Ã£o remota"
+ 
+ #: ../system-config-printer.glade.h:51
+ msgid "Allow users to cancel any job (not just their own)"
+-msgstr ""
+-"Permitir aos usuÃ¡rios cancelar qualquer trabalho de impressÃ£o (nÃ£o somente "
+-"seus prÃ³prios trabalhos)"
++msgstr "Permitir aos usuÃ¡rios cancelar qualquer trabalho de impressÃ£o (nÃ£o somente seus prÃ³prios trabalhos)"
+ 
+ #: ../system-config-printer.glade.h:52
+ msgid "Apply"
+@@ -891,8 +891,7 @@ msgstr "Ajuste de tonalidade:"
+ 
+ #: ../system-config-printer.glade.h:119
+ msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
+-msgstr ""
+-"DescriÃ§Ã£o legÃvel, tal como, \"HP LaserJet com dois sentidos (Duplexer)\""
++msgstr "DescriÃ§Ã£o legÃvel, tal como, \"HP LaserJet com dois sentidos (Duplexer)\""
+ 
+ #: ../system-config-printer.glade.h:120
+ msgid "Human-readable location such as \"Lab 1\""
+@@ -1084,7 +1083,8 @@ msgstr "PÃ¡ginas por lado:"
+ msgid "Parity"
+ msgstr "Paridade"
+ 
+-#: ../system-config-printer.glade.h:187 ../applet.glade.h:5
++#: ../system-config-printer.glade.h:187
++#: ../applet.glade.h:5
+ msgid "Password:"
+ msgstr "Senha:"
+ 
+@@ -1113,15 +1113,8 @@ msgstr ""
+ "Retrato invertido (180Â°)"
+ 
+ #: ../system-config-printer.glade.h:195
+-msgid ""
+-"PostScript Printer Description (PPD) files can often found on the driver "
+-"disk that comes with the printer. For PostScript printers they are often "
+-"part of the Windows<sup>Â®</sup> driver."
+-msgstr ""
+-"Arquivos PostScript Printer Description (PPD) podem ser freqÃ¼entemente "
+-"encontrados nos discos de drivers que vÃªm com as impressoras. Para "
+-"impressoras PostScript eles sÃ£o freqÃ¼entemente parte dos drivers "
+-"Windows<sup>Â®</sup>."
++msgid "PostScript Printer Description (PPD) files can often found on the driver disk that comes with the printer. For PostScript printers they are often part of the Windows<sup>Â®</sup> driver."
++msgstr "Arquivos PostScript Printer Description (PPD) podem ser freqÃ¼entemente encontrados nos discos de drivers que vÃªm com as impressoras. Para impressoras PostScript eles sÃ£o freqÃ¼entemente parte dos drivers Windows<sup>Â®</sup>."
+ 
+ #: ../system-config-printer.glade.h:196
+ msgid "Pretty print"
+@@ -1220,14 +1213,8 @@ msgid "Sides:"
+ msgstr "Lados:"
+ 
+ #: ../system-config-printer.glade.h:223
+-msgid ""
+-"Specify the default job options for this printer.  Jobs arriving at this "
+-"print server will have these options added if they are not already set by "
+-"the application."
+-msgstr ""
+-"Especifique as opÃ§Ãµes padrÃ£o de trabalho desta impressora. Os trabalhos que "
+-"chegarem neste servidor de impressÃ£o terÃ£o estas opÃ§Ãµes adicionadas, caso "
+-"elas nÃ£o tenham sido definidas previamente pela aplicaÃ§Ã£o."
++msgid "Specify the default job options for this printer.  Jobs arriving at this print server will have these options added if they are not already set by the application."
++msgstr "Especifique as opÃ§Ãµes padrÃ£o de trabalho desta impressora. Os trabalhos que chegarem neste servidor de impressÃ£o terÃ£o estas opÃ§Ãµes adicionadas, caso elas nÃ£o tenham sido definidas previamente pela aplicaÃ§Ã£o."
+ 
+ #: ../system-config-printer.glade.h:224
+ msgid "Starting Banner:"
+@@ -1243,43 +1230,20 @@ msgid "System-Config-Printer %s"
+ msgstr "System-Config-Printer %s"
+ 
+ #: ../system-config-printer.glade.h:228
+-msgid ""
+-"The foomatic printer database contains various manufacturer provided "
+-"PostScript Printer Description (PPD) files and also can generate PPD files "
+-"for a large number of (non PostScript) printers. But in general manufacturer "
+-"provided PPD files provide better access to the specific features of the "
+-"printer."
+-msgstr ""
+-"A base de dados de impressoras foomatic contÃ©m vÃ¡rios arquivos PostScript "
+-"Printer Description (PPD) fornecidos pelos fabricantes e tambÃ©m pode gerar "
+-"arquivos PPD para um grande numero de impressoras (nÃ£o PostScript). Mas em "
+-"geral os arquivos PPD fornecidos pelos fabricantes oferecem melhor acesso Ã s "
+-"funcionalidades especÃficas das impressoras."
++msgid "The foomatic printer database contains various manufacturer provided PostScript Printer Description (PPD) files and also can generate PPD files for a large number of (non PostScript) printers. But in general manufacturer provided PPD files provide better access to the specific features of the printer."
++msgstr "A base de dados de impressoras foomatic contÃ©m vÃ¡rios arquivos PostScript Printer Description (PPD) fornecidos pelos fabricantes e tambÃ©m pode gerar arquivos PPD para um grande numero de impressoras (nÃ£o PostScript). Mas em geral os arquivos PPD fornecidos pelos fabricantes oferecem melhor acesso Ã s funcionalidades especÃficas das impressoras."
+ 
+ #: ../system-config-printer.glade.h:229
+-msgid ""
+-"This is done by assuming that options with the same name do have the same "
+-"meaning. Settings of options that are not present in the new PPD will be "
+-"lost and options only present in the new PPD will be set to default."
+-msgstr ""
+-"Isto Ã© feito assumindo que opÃ§Ãµes que tenham o mesmo nome tem o mesmo "
+-"significado. ConfiguraÃ§Ãµes de opÃ§Ãµes que nÃ£o estÃ£o presentes no novo PPD "
+-"serÃ£o perdidas e somente as opÃ§Ãµes presentes no novo PPD serÃ£o definidas por "
+-"padrÃ£o."
++msgid "This is done by assuming that options with the same name do have the same meaning. Settings of options that are not present in the new PPD will be lost and options only present in the new PPD will be set to default."
++msgstr "Isto Ã© feito assumindo que opÃ§Ãµes que tenham o mesmo nome tem o mesmo significado. ConfiguraÃ§Ãµes de opÃ§Ãµes que nÃ£o estÃ£o presentes no novo PPD serÃ£o perdidas e somente as opÃ§Ãµes presentes no novo PPD serÃ£o definidas por padrÃ£o."
+ 
+ #: ../system-config-printer.glade.h:230
+-msgid ""
+-"This way all current option settings will be lost. The default settings of "
+-"the new PPD will be used. "
+-msgstr ""
+-"Desta maneira todas as atuais configuraÃ§Ãµes serÃ£o perdidas. As configuraÃ§Ãµes "
+-"padrÃ£o do novo PPD serÃ£o utilizadas."
++msgid "This way all current option settings will be lost. The default settings of the new PPD will be used. "
++msgstr "Desta maneira todas as atuais configuraÃ§Ãµes serÃ£o perdidas. As configuraÃ§Ãµes padrÃ£o do novo PPD serÃ£o utilizadas."
+ 
+ #: ../system-config-printer.glade.h:231
+ msgid "To add a new option, enter its name in the box below and click to add."
+-msgstr ""
+-"Para adicionar uma nova opÃ§Ã£o, insira o nome no espaÃ§o abaixo e clique para "
+-"adicionar."
++msgstr "Para adicionar uma nova opÃ§Ã£o, insira o nome no espaÃ§o abaixo e clique para adicionar."
+ 
+ #: ../system-config-printer.glade.h:232
+ msgid "Top margin:"
+@@ -1313,7 +1277,8 @@ msgstr "_NÃ£o aplicar"
+ msgid "_Edit"
+ msgstr "_Editar"
+ 
+-#: ../system-config-printer.glade.h:240 ../applet.glade.h:10
++#: ../system-config-printer.glade.h:240
++#: ../applet.glade.h:10
+ msgid "_File"
+ msgstr "_Arquivo"
+ 
+@@ -1558,19 +1523,17 @@ msgid "Missing printer driver"
+ msgstr "Driver da impressora faltando"
+ 
+ #: ../applet.py:1032
+-#, fuzzy
+ msgid "Install printer driver"
+-msgstr "Instalar o driver"
++msgstr "Instalar o driver da impressora"
+ 
+ #: ../applet.py:1033
+ #, python-format
+ msgid "`%s' requires driver installation: %s."
+-msgstr ""
++msgstr "\"%s\" requer a instalaÃ§Ã£o de um driver: %s."
+ 
+ #: ../applet.py:1036
+-#, fuzzy
+ msgid "Install"
+-msgstr "_Instalar"
++msgstr "Instalar"
+ 
+ #: ../applet.py:1039
+ #, python-format
+@@ -1633,8 +1596,7 @@ msgstr "Miniaplicativo da Fila de Impres
+ 
+ #: ../print-applet.desktop.in.h:2
+ msgid "System tray icon for managing print jobs"
+-msgstr ""
+-"Ãcone de bandeja do sistema para o gerenciamento de trabalhos de impressÃ£o"
++msgstr "Ãcone de bandeja do sistema para o gerenciamento de trabalhos de impressÃ£o"
+ 
+ #: ../manage-print-jobs.desktop.in.h:1
+ msgid "Cancel, pause, resume or reprint jobs"
+@@ -1650,3 +1612,4 @@ msgstr "Selecionar a impressora padrÃ£o"
+ 
+ #~ msgid "3"
+ #~ msgstr "3"
++
+diff -up system-config-printer-0.7.74.10/po/en_GB.po.0.7.74.x system-config-printer-0.7.74.10/po/en_GB.po
+--- system-config-printer-0.7.74.10/po/en_GB.po.0.7.74.x	2008-01-24 10:08:46.000000000 +0000
++++ system-config-printer-0.7.74.10/po/en_GB.po	2008-02-02 11:10:52.000000000 +0000
+@@ -697,7 +697,7 @@ msgstr "Connect to CUPS server"
+ 
+ #: ../system-config-printer.glade.h:65
+ msgid "Connect to a different print server"
+-msgstr "ConnectÂ·toÂ·aÂ·differentÂ·printÂ·server"
++msgstr "Connect to a different print server"
+ 
+ #: ../system-config-printer.glade.h:66
+ msgid "Connecting"
+@@ -722,7 +722,7 @@ msgstr "Copy Printer"
+ 
+ #: ../system-config-printer.glade.h:73
+ msgid "Copy this printer queue"
+-msgstr "CopyÂ·thisÂ·printerÂ·queue"
++msgstr "Copy this printer queue"
+ 
+ #: ../system-config-printer.glade.h:74
+ msgid "Copyright"
+@@ -730,11 +730,11 @@ msgstr "Copyright"
+ 
+ #: ../system-config-printer.glade.h:75
+ msgid "Create a new printer group"
+-msgstr "CreateÂ·aÂ·newÂ·printerÂ·group"
++msgstr "Create a new printer group"
+ 
+ #: ../system-config-printer.glade.h:76
+ msgid "Create a new printer queue"
+-msgstr "CreateÂ·aÂ·newÂ·printerÂ·queue"
++msgstr "Create a new printer queue"
+ 
+ #: ../system-config-printer.glade.h:77
+ msgid "Data Bits"
+@@ -800,7 +800,7 @@ msgstr ""
+ 
+ #: ../system-config-printer.glade.h:99
+ msgid "Delete this printer queue"
+-msgstr "DeleteÂ·thisÂ·printerÂ·queue"
++msgstr "Delete this printer queue"
+ 
+ #: ../system-config-printer.glade.h:100
+ msgid "Deny printing for everyone except these users:"
+@@ -1132,7 +1132,7 @@ msgstr "Provide PPD file"
+ 
+ #: ../system-config-printer.glade.h:204
+ msgid "Refresh the list of printer queues"
+-msgstr "RefreshÂ·theÂ·listÂ·ofÂ·printerÂ·queues"
++msgstr "Refresh the list of printer queues"
+ 
+ #: ../system-config-printer.glade.h:205
+ msgid "Require encryption"
+@@ -1543,12 +1543,12 @@ msgstr "Missing printer driver"
+ 
+ #: ../applet.py:1032
+ msgid "Install printer driver"
+-msgstr "InstallÂ·printerÂ·driver"
++msgstr "Install printer driver"
+ 
+ #: ../applet.py:1033
+ #, python-format
+ msgid "`%s' requires driver installation: %s."
+-msgstr "`%s'Â·requiresÂ·driverÂ·installation:Â·%s."
++msgstr "`%s' requires driver installation: %s."
+ 
+ #: ../applet.py:1036
+ msgid "Install"
+diff -U0 system-config-printer-0.7.74.10/ChangeLog.0.7.74.x system-config-printer-0.7.74.10/ChangeLog
+--- system-config-printer-0.7.74.10/ChangeLog.0.7.74.x	2008-01-24 10:07:12.000000000 +0000
++++ system-config-printer-0.7.74.10/ChangeLog	2008-02-02 11:10:52.000000000 +0000
+@@ -0,0 +1,8 @@
++2008-02-02  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (debugprint): New function.
++
++2008-01-31  Tim Waugh  <twaugh at redhat.com>
++
++	* ppds.py (PPDs._findBestMatchPPDs): Fixed thinko.
++
+diff -up system-config-printer-0.7.74.10/ppds.py.0.7.74.x system-config-printer-0.7.74.10/ppds.py
+--- system-config-printer-0.7.74.10/ppds.py.0.7.74.x	2008-01-24 10:07:12.000000000 +0000
++++ system-config-printer-0.7.74.10/ppds.py	2008-02-02 11:10:52.000000000 +0000
+@@ -2,9 +2,9 @@
+ 
+ ## system-config-printer
+ 
+-## Copyright (C) 2006, 2007 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+ ## Copyright (C) 2006 Florian Festi <ffesti at redhat.com>
+-## Copyright (C) 2006, 2007 Tim Waugh <twaugh at redhat.com>
++## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+ 
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+@@ -528,7 +528,7 @@ class PPDs:
+             digits_start = -1
+             digits_end = -1
+             for i in range (len (modelid)):
+-                if word[i].isdigit ():
++                if modelid[i].isdigit ():
+                     if digits_start == -1:
+                         digits_start = i
+                     digits_end = i


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- system-config-printer.spec	28 Jan 2008 09:38:33 -0000	1.124
+++ system-config-printer.spec	2 Feb 2008 11:16:40 -0000	1.125
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,7 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
-Patch0: system-config-printer-british.patch
+Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -54,7 +54,7 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p1 -b .british
+%patch0 -p1 -b .0.7.74.x
 
 %build
 %configure
@@ -137,6 +137,9 @@
 exit 0
 
 %changelog
+* Sat Feb  2 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.10-3
+- Added missing debugprint function (bug #431252).
+
 * Mon Jan 28 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.10-2
 - Fixed British translation.
 


--- system-config-printer-0.7.74.8.tar.bz2.sig DELETED ---


--- system-config-printer-british.patch DELETED ---


