|
 |
0a882b |
diff -up system-config-printer-1.4.1/newprinter.py.utf8-969846 system-config-printer-1.4.1/newprinter.py
|
|
|
0a882b |
--- system-config-printer-1.4.1/newprinter.py.utf8-969846 2013-06-06 17:07:44.113770877 +0100
|
|
|
0a882b |
+++ system-config-printer-1.4.1/newprinter.py 2013-06-06 17:08:30.764007511 +0100
|
|
|
0a882b |
@@ -3377,7 +3377,7 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
recommended = (auto_make_norm and
|
|
|
0a882b |
cupshelpers.ppds.normalize (make) == auto_make_norm)
|
|
|
0a882b |
if self.device and self.device.make_and_model and recommended:
|
|
|
0a882b |
- text = make + _(" (recommended)")
|
|
|
0a882b |
+ text = make + _(" (recommended)").decode ('utf-8')
|
|
|
0a882b |
else:
|
|
|
0a882b |
text = make
|
|
|
0a882b |
|
|
|
0a882b |
@@ -3440,7 +3440,7 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
cupshelpers.ppds.normalize (pmodel) ==
|
|
|
0a882b |
auto_model_norm)
|
|
|
0a882b |
if self.device and self.device.make_and_model and recommended:
|
|
|
0a882b |
- text = pmodel + _(" (recommended)")
|
|
|
0a882b |
+ text = pmodel + _(" (recommended)").decode ('utf-8')
|
|
|
0a882b |
else:
|
|
|
0a882b |
text = pmodel
|
|
|
0a882b |
|
|
|
0a882b |
@@ -3528,7 +3528,8 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
driverlist.append (driver)
|
|
|
0a882b |
NPDrivers.append (ppdname)
|
|
|
0a882b |
i += 1
|
|
|
0a882b |
- iter = model.append ((driver + _(" (Current)"),))
|
|
|
0a882b |
+ iter = model.append ((driver +
|
|
|
0a882b |
+ _(" (Current)").decode ('utf-8'),))
|
|
|
0a882b |
path = model.get_path (iter)
|
|
|
0a882b |
self.tvNPDrivers.get_selection().select_path(path)
|
|
|
0a882b |
self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0)
|
|
|
0a882b |
@@ -3536,7 +3537,8 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
driverlist.append (driver)
|
|
|
0a882b |
NPDrivers.append (ppdname)
|
|
|
0a882b |
i += 1
|
|
|
0a882b |
- iter = model.append ((driver + _(" (recommended)"),))
|
|
|
0a882b |
+ iter = model.append ((driver +
|
|
|
0a882b |
+ _(" (recommended)").decode ('utf-8'),))
|
|
|
0a882b |
path = model.get_path (iter)
|
|
|
0a882b |
self.tvNPDrivers.get_selection().select_path(path)
|
|
|
0a882b |
self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0)
|