diff --git a/0001-fix-system-config-printer-Fix-interface-translation.patch b/0001-fix-system-config-printer-Fix-interface-translation.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ee16deae2f37e8e93c21c154de8e9c02d02ae2aa
--- /dev/null
+++ b/0001-fix-system-config-printer-Fix-interface-translation.patch
@@ -0,0 +1,35 @@
+From d5d42c5e277cd3ce7df96aaba2331fe76322e27b Mon Sep 17 00:00:00 2001
+From: luoqing <luoqing@kylinsec.com.cn>
+Date: Fri, 9 Jun 2023 11:29:59 +0800
+Subject: [PATCH 6/6] fix(system-config-printer):Fix interface translation
+ garbled code under GB18030 encoding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修复在GB18030编码下界面翻译乱码
+
+Close #7014
+---
+ system-config-printer.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/system-config-printer.py b/system-config-printer.py
+index f3e2663..98cdad6 100755
+--- a/system-config-printer.py
++++ b/system-config-printer.py
+@@ -67,9 +67,11 @@ cups.ppdSetConformance (cups.PPD_CONFORM_RELAXED)
+ import locale
+ try:
+     locale.setlocale (locale.LC_ALL, "")
++    locale.bind_textdomain_codeset("system-config-printer","UTF-8")
+ except locale.Error:
+     os.environ['LC_ALL'] = 'C'
+     locale.setlocale (locale.LC_ALL, "")
++    locale.bind_textdomain_codeset("system-config-printer","UTF-8")
+ import gettext
+ gettext.install(domain=config.PACKAGE, localedir=config.localedir)
+ 
+-- 
+2.27.0
+
diff --git a/1.5.11.tar.gz b/1.5.11.tar.gz
deleted file mode 100644
index d1706d2c68fb4fc2f8231375b02f7ceab31afb03..0000000000000000000000000000000000000000
Binary files a/1.5.11.tar.gz and /dev/null differ
diff --git a/6001-Fix-debugprint-in-options.py-fixes-291.patch b/6001-Fix-debugprint-in-options.py-fixes-291.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2dc233c9f199c4b6fd3f35b10341caa1c0f498ae
--- /dev/null
+++ b/6001-Fix-debugprint-in-options.py-fixes-291.patch
@@ -0,0 +1,26 @@
+From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 13 Oct 2022 14:03:37 +0200
+Subject: [PATCH] Fix debugprint() in options.py (fixes #291)
+
+---
+ NEWS       | 4 ++++
+ options.py | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/options.py b/options.py
+index d756f98d..d7c236de 100644
+--- a/options.py
++++ b/options.py
+@@ -423,7 +423,7 @@ class OptionSelectOne(Option):
+             debugprint("Unknown value for %s: %s" % (name, value))
+             debugprint("Choices: %s" % (supported))
+             if len(supported) > 0:
+-                debugprint("Selecting from choices:", supported[0])
++                debugprint("Selecting from choices: %s" % supported[0])
+                 self.selector.set_active(0)
+         self.selector.connect("changed", self.changed)
+ 
+-- 
+2.39.2
+
diff --git a/6002-udev-Fix-exit-value-when-device-is-already-handled.patch b/6002-udev-Fix-exit-value-when-device-is-already-handled.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e22102b89492f1be04813c1201a625ce08a0c9f8
--- /dev/null
+++ b/6002-udev-Fix-exit-value-when-device-is-already-handled.patch
@@ -0,0 +1,35 @@
+From 77540d0cb539364bbf63e21cfa970e62d9a86ed3 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Tue, 12 Mar 2024 18:59:43 +0100
+Subject: [PATCH] udev: Fix exit value when device is already handled
+
+---
+ NEWS                          | 1 +
+ udev/udev-configure-printer.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index fd158b09..5703c1af 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -806,7 +806,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
+   {
+     udev_device_unref (dev);
+     syslog (LOG_ERR, "unable to access %s", syspath);
+-    return NULL;
++    exit (1);
+   }
+ 
+   usb_device_devpath = strdup (udev_device_get_devpath (dev));
+@@ -831,7 +831,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
+     syslog (LOG_DEBUG, "Device already handled");
+     free (usb_device_devpath);
+     free (devicefilepath);
+-    return NULL;
++    exit (0);
+   }
+ 
+   serial = udev_device_get_sysattr_value (dev, "serial");
+-- 
+2.44.0
+
diff --git a/Fix-constructing-the-auth-dialog.patch b/Fix-constructing-the-auth-dialog.patch
deleted file mode 100644
index ccbda953f181e288ef4607d8413e9cac9470ac85..0000000000000000000000000000000000000000
--- a/Fix-constructing-the-auth-dialog.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2766d74a98e44693f5e966d541a6303b966c088b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 8 Feb 2018 17:01:01 +0100
-Subject: [PATCH] Fix constructing the auth dialog
-
-47973c80 (Remove deprecated Gtk objects) broke the auth dialog.
-
-Fixes https://bugs.archlinux.org/task/57364.
----
- authconn.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/authconn.py b/authconn.py
-index 2a645dcc..0f3021cb 100644
---- a/authconn.py
-+++ b/authconn.py
-@@ -78,11 +78,9 @@ class AuthDialog(Gtk.Dialog):
-             field = auth_info_required[i]
-             label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field)))
-             label.set_alignment (0, 0.5)
--            grid.attach (label, 0, 1, i, i + 1)
-             grid.attach (label, 0, i, 1, 1)
-             entry = Gtk.Entry ()
-             entry.set_visibility (field != 'password')
--            grid.attach (entry, 1, 2, i, i + 1, 0, 0)
-             grid.attach (entry, 1, i, 1, 1)
-             self.field_entry.append (entry)
- 
--- 
-2.25.1
-
diff --git a/Fix-typo.patch b/Fix-typo.patch
deleted file mode 100644
index ea541ff79a65950ed1ddf2a2855d430247027a46..0000000000000000000000000000000000000000
--- a/Fix-typo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5260d44bebbb261aa7231e0be323967655bb863d Mon Sep 17 00:00:00 2001
-From: AsciiWolf <mail@asciiwolf.com>
-Date: Sat, 10 Mar 2018 20:48:13 +0100
-Subject: [PATCH] Fix typo
-
----
- ppdippstr.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ppdippstr.py b/ppdippstr.py
-index fdbf5818..0e5aded9 100644
---- a/ppdippstr.py
-+++ b/ppdippstr.py
-@@ -118,7 +118,7 @@ def init ():
-             "Resolution": _("Resolution"),
-             
-             "Color Mode": _("Color Mode"),
--            "Hight Quality Grayscale": _("Hight Quality Grayscale"),
-+            "High Quality Grayscale": _("High Quality Grayscale"),
-             "Black Only Grayscale": _("Black Only Grayscale"),
-             
-             "Quality": _("Quality"),
-@@ -146,7 +146,7 @@ def init ():
-                 "Transparency": _("Transparency"),
-                 "Plain Paper": _("Plain Paper"),
-                 "Plain": _("Plain"),
--                "Photo Paper)": _("Photo Paper)"),
-+                "Photo Paper": _("Photo Paper"),
-                 "Transparency Film": _("Transparency Film"),
-                 "CD or DVD Media": _("CD or DVD Media"),
-             "Print Density": _("Print Density"),
--- 
-2.25.1
-
diff --git a/Update-da.po.patch b/Update-da.po.patch
deleted file mode 100644
index 4d09cc919ad69bfdd23007bbf885435caadb83c7..0000000000000000000000000000000000000000
--- a/Update-da.po.patch
+++ /dev/null
@@ -1,986 +0,0 @@
-From 0b173563934cf26b022ec4b9bf8c632ab42ea5a2 Mon Sep 17 00:00:00 2001
-From: Alan01 <alanmortensen.am@gmail.com>
-Date: Mon, 2 Apr 2018 15:04:33 +0200
-Subject: [PATCH] Update da.po
-
----
- po/da.po | 358 ++++++++++++++++++++++++++++---------------------------
- 1 file changed, 185 insertions(+), 173 deletions(-)
-
-diff --git a/po/da.po b/po/da.po
-index 5a42dfbb..b16d5c8b 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -6,13 +6,14 @@
- # Dimitris Glezos <glezos@transifex.com>, 2011
- # Kris <mail@kristhomsen.dk>, 2015. #zanata
- # scootergrisen <scootergrisen@gmail.com>, 2017. #zanata
-+# Alan Mortensen <alanmortensen.am@gmail.com>, 2018.
- msgid ""
- msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: \n"
- "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2018-01-23 10:27+0100\n"
--"PO-Revision-Date: 2017-10-27 03:40-0400\n"
--"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
-+"PO-Revision-Date: 2018-04-02 15:00+0200\n"
-+"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
- "Language-Team: Danish (http://www.transifex.com/projects/p/system-config-"
- "printer/language/da/)\n"
- "Language: da\n"
-@@ -20,7 +21,7 @@ msgstr ""
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=(n != 1);\n"
--"X-Generator: Zanata 3.9.6\n"
-+"X-Generator: Poedit 1.8.7.1\n"
- 
- #: ../asyncipp.py:473 ../authconn.py:456 ../authconn.py:458
- #: ../errordialogs.py:63 ../pysmb.py:90 ../pysmb.py:92
-@@ -787,6 +788,8 @@ msgid ""
- "A fax machine or the fax function of a multi-function device connected to a "
- "USB port."
- msgstr ""
-+"En fax eller faxfunktionen på en multifunktionsenhed forbundet til en USB-"
-+"port."
- 
- #: ../newprinter.py:3251
- msgid "A printer connected to a USB port."
-@@ -1020,15 +1023,15 @@ msgstr "Generelt"
- #. HP
- #: ../ppdippstr.py:97
- msgid "Print Quality"
--msgstr ""
-+msgstr "Udskriftskvalitet"
- 
- #: ../ppdippstr.py:98
- msgid "Automatic"
--msgstr ""
-+msgstr "Automatisk"
- 
- #: ../ppdippstr.py:100
- msgid "Printing Quality"
--msgstr ""
-+msgstr "Udskriftskvalitet"
- 
- #: ../ppdippstr.py:101 ../printerproperties.py:324
- msgid "Draft"
-@@ -1040,249 +1043,254 @@ msgstr "Normal"
- 
- #: ../ppdippstr.py:103
- msgid "Normal Color"
--msgstr ""
-+msgstr "Normal farve"
- 
- #: ../ppdippstr.py:104
- msgid "Normal Grayscale"
--msgstr ""
-+msgstr "Normal gråtoneskala"
- 
- #: ../ppdippstr.py:105
- msgid "Draft Color"
--msgstr ""
-+msgstr "Kladdefarve"
- 
- #: ../ppdippstr.py:106
- msgid "Draft Grayscale"
--msgstr ""
-+msgstr "Kladdegråtoneskala"
- 
- #: ../ppdippstr.py:107
- msgid "Best"
--msgstr ""
-+msgstr "Bedst"
- 
- #: ../ppdippstr.py:108
- msgid "High-Resolution Photo"
--msgstr ""
-+msgstr "Foto i høj opløsning"
- 
- #: ../ppdippstr.py:109
- msgid "Fast Draft"
--msgstr ""
-+msgstr "Hurtig kladde"
- 
- #: ../ppdippstr.py:111
- msgid "Installed Cartridges"
--msgstr ""
-+msgstr "Installerede patroner"
- 
- #: ../ppdippstr.py:112 ../ppdippstr.py:113
- msgid "Fast Only"
--msgstr ""
-+msgstr "Kun hurtig"
- 
- #: ../ppdippstr.py:114
- msgid "Photo Only"
--msgstr ""
-+msgstr "Kun foto"
- 
- #: ../ppdippstr.py:115
- msgid "Black and TriColor"
--msgstr ""
-+msgstr "Sort og tre farver"
- 
- #: ../ppdippstr.py:116
- msgid "Photo and TriColor"
--msgstr ""
-+msgstr "Foto og tre farver"
- 
- #: ../ppdippstr.py:118
- msgid "Resolution"
--msgstr ""
-+msgstr "Opløsning"
- 
- #: ../ppdippstr.py:120
- msgid "Color Mode"
--msgstr ""
-+msgstr "Farvetilstand"
- 
- #: ../ppdippstr.py:121
- msgid "Hight Quality Grayscale"
--msgstr ""
-+msgstr "Gråtoneskala i høj kvalitet"
- 
- #: ../ppdippstr.py:122
- msgid "Black Only Grayscale"
--msgstr ""
-+msgstr "Gråtoneskala kun med sort"
- 
- #: ../ppdippstr.py:124
- msgid "Quality"
--msgstr ""
-+msgstr "Kvalitet"
- 
- #: ../ppdippstr.py:125
--#, fuzzy
- msgid "High Resolution "
--msgstr "Printeropløsning:"
-+msgstr "Høj opløsning "
- 
- #: ../ppdippstr.py:126
- msgid "Paper source"
--msgstr ""
-+msgstr "Papirkilde"
- 
- #: ../ppdippstr.py:127
- msgid "Auto Source"
--msgstr ""
-+msgstr "Automatisk kilde"
- 
- #: ../ppdippstr.py:128
- msgid "Manual Feed"
--msgstr ""
-+msgstr "Manual indføring"
- 
- #: ../ppdippstr.py:129
- msgid "Middle Tray"
--msgstr ""
-+msgstr "Midterste bakke"
- 
- #: ../ppdippstr.py:130
- msgid "Upper or Only One InputSlot"
--msgstr ""
-+msgstr "Øvre eller kun et inputstik"
- 
-+# MS
- #: ../ppdippstr.py:131
- msgid "Multi-purpose Tray"
--msgstr ""
-+msgstr "Flerfunktionsbakke"
- 
- #: ../ppdippstr.py:132
- msgid "Drawer 1 "
--msgstr ""
-+msgstr "Skuffe 1 "
- 
- #: ../ppdippstr.py:133
- msgid "Drawer 2 "
--msgstr ""
-+msgstr "Skuffe 2 "
- 
- #: ../ppdippstr.py:134
- msgid "Tray 1"
--msgstr ""
-+msgstr "Bakke 1"
- 
- #: ../ppdippstr.py:135
- msgid "Auto Select"
--msgstr ""
-+msgstr "Vælg automatisk"
- 
- #: ../ppdippstr.py:137
- msgid "Media Type"
--msgstr ""
-+msgstr "Medietype"
- 
-+# MS har: Bond paper print = Udskrivning på kontraktpapir
- #: ../ppdippstr.py:138
- msgid "Bond"
--msgstr ""
-+msgstr "Kontrakt"
- 
- #: ../ppdippstr.py:139
- msgid "Color"
--msgstr ""
-+msgstr "Farve"
- 
- #: ../ppdippstr.py:140
- msgid "Envelope"
--msgstr ""
-+msgstr "Konvolut"
- 
- #: ../ppdippstr.py:141
- msgid "Labels"
--msgstr ""
-+msgstr "Etiketter"
- 
- #: ../ppdippstr.py:142
- msgid "Standard Paper"
--msgstr ""
-+msgstr "Standardpapir"
- 
- #: ../ppdippstr.py:143
- msgid "Heavy"
--msgstr ""
-+msgstr "Tungt"
- 
- #: ../ppdippstr.py:144
- msgid "Light"
--msgstr ""
-+msgstr "Let"
- 
- #: ../ppdippstr.py:145
- msgid "Recycled"
--msgstr ""
-+msgstr "Genbrugspapir"
- 
- #: ../ppdippstr.py:146
- msgid "Transparency"
--msgstr ""
-+msgstr "Overhead"
- 
- #: ../ppdippstr.py:147
- msgid "Plain Paper"
--msgstr ""
-+msgstr "Almindeligt papir"
- 
- #: ../ppdippstr.py:148
- msgid "Plain"
--msgstr ""
-+msgstr "Almindeligt"
- 
-+# ) må være en fejl
- #: ../ppdippstr.py:149
- msgid "Photo Paper)"
--msgstr ""
-+msgstr "Fotopapir"
- 
-+# Transparency og Transparency Film er, så vidt jeg kan se, det samme. Jeg bruger et andet ord, så Overhead ikke optræder to gange.
- #: ../ppdippstr.py:150
- msgid "Transparency Film"
--msgstr ""
-+msgstr "Transparent"
- 
- #: ../ppdippstr.py:151
- msgid "CD or DVD Media"
--msgstr ""
-+msgstr "Cd'er eller dvd'er"
- 
- #: ../ppdippstr.py:152
- msgid "Print Density"
--msgstr ""
-+msgstr "Udskriftstæthed"
- 
- #: ../ppdippstr.py:153
- msgid "Extra Light (1)"
--msgstr ""
-+msgstr "Ekstra lys (1)"
- 
- #: ../ppdippstr.py:154
- msgid "Light (2)"
--msgstr ""
-+msgstr "Lys (2)"
- 
- #: ../ppdippstr.py:155
- msgid "Medium (3)"
--msgstr ""
-+msgstr "Mellem (3)"
- 
- #: ../ppdippstr.py:156
- msgid "Dark (4)"
--msgstr ""
-+msgstr "Mørk (4)"
- 
- #: ../ppdippstr.py:157
- msgid "Extra Dark (5)"
--msgstr ""
-+msgstr "Ekstra mørk (5)"
- 
- #: ../ppdippstr.py:158
- msgid "Copies"
--msgstr ""
-+msgstr "Antal kopier"
- 
- #: ../ppdippstr.py:160
- msgid "Adjustment"
--msgstr ""
-+msgstr "Justering"
- 
- #: ../ppdippstr.py:161
- msgid "Halftone Algorithm"
--msgstr ""
-+msgstr "Rasteralgortime"
- 
- #: ../ppdippstr.py:164
- msgid "Miscellaneous"
--msgstr ""
-+msgstr "Diverse"
- 
- #: ../ppdippstr.py:165
- msgid "N-up Orientation"
--msgstr ""
-+msgstr "N-op-orientering"
- 
- #: ../ppdippstr.py:166
- msgid "N-up Printing"
--msgstr ""
-+msgstr "N-op-udskrivning"
- 
- #: ../ppdippstr.py:167
- msgid "Landscape"
--msgstr ""
-+msgstr "Landskab"
- 
-+# Et billede som viser havet - en af tre valgmuligheder til N-up Orientation: portrait landscape, seascape
-+# Kaldes tilsyneladende også reverse landscape: https://www.cs.utexas.edu/facilities/documentation/printing-options
- #: ../ppdippstr.py:168
- msgid "Seascape"
--msgstr ""
-+msgstr "Omvendt landskab"
- 
- #: ../ppdippstr.py:169
- msgid "Media Size"
--msgstr ""
-+msgstr "Mediestørrelse"
- 
- #: ../ppdippstr.py:170
- msgid "Output Mode"
--msgstr ""
-+msgstr "Outputtilstand"
- 
- #: ../ppdippstr.py:171
- msgid "Grayscale"
--msgstr ""
-+msgstr "Gråtoneskala"
- 
- #. Brother
- #: ../ppdippstr.py:174
- msgid "Two-Sided"
--msgstr ""
-+msgstr "Tosidet"
- 
- #: ../ppdippstr.py:175 ../system-config-printer.desktop.in.h:1
- #: ../system-config-printer.appdata.xml.in.h:1
-@@ -1291,60 +1299,60 @@ msgstr "Udskriftsindstillinger"
- 
- #: ../ppdippstr.py:176
- msgid "Print Settings  (Advanced)"
--msgstr ""
-+msgstr "Udskriftsindstillinger (avanceret)"
- 
- #: ../ppdippstr.py:177
- msgid "Color Settings"
--msgstr ""
-+msgstr "Farveindstillinger"
- 
- #: ../ppdippstr.py:178
- msgid "Color Settings (Advanced)"
--msgstr ""
-+msgstr "Farveindstillinger (avanceret)"
- 
- #: ../ppdippstr.py:179
- msgid "Brightness"
--msgstr ""
-+msgstr "Lysstyrke"
- 
- #: ../ppdippstr.py:180
- msgid "Contrast"
--msgstr ""
-+msgstr "Kontrast"
- 
- #: ../ppdippstr.py:181
- msgid "Red"
--msgstr ""
-+msgstr "Rød"
- 
- #: ../ppdippstr.py:182
- msgid "Green"
--msgstr ""
-+msgstr "Grøn"
- 
- #: ../ppdippstr.py:183
- msgid "Blue"
--msgstr ""
-+msgstr "Blå"
- 
- #. Epson xp serie
- #: ../ppdippstr.py:186
- msgid "_Media Size"
--msgstr ""
-+msgstr "_Mediestørrelse"
- 
- #: ../ppdippstr.py:187
- msgid "_Grayscale"
--msgstr ""
-+msgstr "_Gråtoneskala"
- 
- #: ../ppdippstr.py:188
- msgid "_Brightness"
--msgstr ""
-+msgstr "_Lysstyrke"
- 
- #: ../ppdippstr.py:189
- msgid "_Contrast"
--msgstr ""
-+msgstr "_Kontrast"
- 
- #: ../ppdippstr.py:190
- msgid "_Saturation"
--msgstr ""
-+msgstr "M_ætning"
- 
- #: ../ppdippstr.py:191
- msgid "On"
--msgstr ""
-+msgstr "Tændt"
- 
- #. Options
- #: ../ppdippstr.py:193 ../printerproperties.py:957
-@@ -1353,186 +1361,189 @@ msgstr "Installerbare tilvalg"
- 
- #: ../ppdippstr.py:194
- msgid "Duplexer Installed"
--msgstr ""
-+msgstr "Dupleksenhed installeret"
- 
- #. Canon
- #: ../ppdippstr.py:197
- msgid "Color Model"
--msgstr ""
-+msgstr "Farvemodel"
- 
- #: ../ppdippstr.py:198
- msgid "Color Precision"
--msgstr ""
-+msgstr "Farvepræcision"
- 
- #: ../ppdippstr.py:199
- msgid "Resolution "
--msgstr ""
-+msgstr "Opløsning"
- 
- #: ../ppdippstr.py:200
- msgid "Printer Features Common"
--msgstr ""
-+msgstr "Fælles printerfunktioner"
- 
- #: ../ppdippstr.py:201
- msgid "CD Hub Size"
--msgstr ""
-+msgstr "Størrelse på cd-hub"
- 
- #: ../ppdippstr.py:202
- msgid "Ink Type"
--msgstr ""
-+msgstr "Blæktype"
- 
- #: ../ppdippstr.py:203
- msgid "Toner Save "
--msgstr ""
-+msgstr "Tonerbesparelse "
- 
- #: ../ppdippstr.py:204
- msgid "ON"
--msgstr ""
-+msgstr "TIL"
- 
- #: ../ppdippstr.py:205
- msgid "Toner Density"
--msgstr ""
-+msgstr "Tonertæthed"
- 
- #: ../ppdippstr.py:206
- msgid "Media Type "
--msgstr ""
-+msgstr "Medietype "
- 
- #: ../ppdippstr.py:207
- msgid "Collate "
--msgstr ""
-+msgstr "Sætvis "
- 
- #: ../ppdippstr.py:208
- msgid "Image Refinement "
--msgstr ""
-+msgstr "Billedforbedring "
- 
- #: ../ppdippstr.py:209
- msgid "Halftones "
--msgstr ""
-+msgstr "Raster "
- 
- #: ../ppdippstr.py:210
- msgid "Duplex"
--msgstr ""
-+msgstr "Dupleks"
- 
- #: ../ppdippstr.py:211
- msgid "OFF"
--msgstr ""
-+msgstr "FRA"
- 
- #: ../ppdippstr.py:212
- msgid "ON (Long-edged Binding)"
--msgstr ""
-+msgstr "TIL (Indbinding på den lange led)"
- 
- #: ../ppdippstr.py:213
- msgid "ON (Short-edged Binding)"
--msgstr ""
-+msgstr "TIL (Indbinding på den korte led)"
- 
- #. Samsung
- #: ../ppdippstr.py:215
- msgid "Paper Size"
--msgstr ""
-+msgstr "Papirstørrelse"
- 
- #: ../ppdippstr.py:216
- msgid "Paper Type"
--msgstr ""
-+msgstr "Papirtype"
- 
- #: ../ppdippstr.py:217
- msgid "Thin"
--msgstr ""
-+msgstr "Tynd"
- 
- #: ../ppdippstr.py:218
- msgid "Thick"
--msgstr ""
-+msgstr "Tyk"
- 
- #: ../ppdippstr.py:219
- msgid "Thicker"
--msgstr ""
-+msgstr "Tykkere"
- 
- #: ../ppdippstr.py:220
- msgid "Edge Enhance"
--msgstr ""
-+msgstr "Kantforbedring"
- 
- #: ../ppdippstr.py:221
- msgid "Skip Blank Pages"
--msgstr ""
-+msgstr "Spring blanke sider over"
- 
- #: ../ppdippstr.py:222
- msgid "Double-sided Printing"
--msgstr ""
-+msgstr "Dobbeltsidet udskrivning"
- 
- #: ../ppdippstr.py:224
- msgid "Reverse Duplex Printing"
--msgstr ""
-+msgstr "Omvendt dupleksudskrivning"
- 
- #: ../ppdippstr.py:225 ../ppdippstr.py:228
- msgid "Long Edge"
--msgstr ""
-+msgstr "Lang kant"
- 
- #: ../ppdippstr.py:226 ../ppdippstr.py:229
- msgid "Short Edge"
--msgstr ""
-+msgstr "Kort kant"
- 
- #: ../ppdippstr.py:227
- msgid "Two-sided"
--msgstr ""
-+msgstr "Tosidet"
- 
- #. Ricoh
- #: ../ppdippstr.py:232
- msgid "Finisher"
--msgstr ""
-+msgstr "Efterbehandler"
- 
- #: ../ppdippstr.py:233
- msgid "Option Tray"
--msgstr ""
-+msgstr "Bakketilvalg"
- 
- #: ../ppdippstr.py:234
- msgid "External Tray"
--msgstr ""
-+msgstr "Ekstern bakke"
- 
- #: ../ppdippstr.py:235
- msgid "Internal Tray"
--msgstr ""
-+msgstr "Intern bakke"
- 
- #: ../ppdippstr.py:236
- msgid "Internal Tray 2"
--msgstr ""
-+msgstr "Intern bakke 2"
- 
-+# http://support.ricoh.com/bb_v1oi/pub_e/oi_view/0001036/0001036377/view/fax/unv/0182.htm
-+# Et modul der kan forskyde de udskrevne dokumenter, så de ikke ligger oven i hinanden
- #: ../ppdippstr.py:237
- msgid "Internal Shift Tray"
--msgstr ""
-+msgstr "Intern forskydningsbakke"
- 
- #: ../ppdippstr.py:238
- msgid "Not Installed"
--msgstr ""
-+msgstr "Ikke installeret"
- 
- #: ../ppdippstr.py:239
- msgid "Installed"
--msgstr ""
-+msgstr "Installeret"
- 
- #: ../ppdippstr.py:240
- msgid "PageSize"
--msgstr ""
-+msgstr "Sidestørrelse"
- 
- #: ../ppdippstr.py:241
- msgid "InputSlot"
--msgstr ""
-+msgstr "Inputstik"
- 
- #: ../ppdippstr.py:242
- msgid "Tray 2"
--msgstr ""
-+msgstr "Bakke 2"
- 
- #: ../ppdippstr.py:243
- msgid "Tray 3"
--msgstr ""
-+msgstr "Bakke 3"
- 
- #: ../ppdippstr.py:244
- msgid "Tray 4"
--msgstr ""
-+msgstr "Bakke 4"
- 
-+# Microsoft
- #: ../ppdippstr.py:245
- msgid "Bypass Tray"
--msgstr ""
-+msgstr "Bypassbakke"
- 
- #: ../ppdippstr.py:246
- msgid "Destination"
--msgstr ""
-+msgstr "Destination"
- 
- #: ../ppdippstr.py:247 ../printerproperties.py:282
- msgid "Staple"
-@@ -1544,15 +1555,15 @@ msgstr "Perforering"
- 
- #: ../ppdippstr.py:249
- msgid "Toner Saving"
--msgstr ""
-+msgstr "Tonerbesparelse"
- 
- #: ../ppdippstr.py:250
- msgid "Gradation"
--msgstr ""
-+msgstr "Farveovergang"
- 
- #: ../ppdippstr.py:251
- msgid "Fast"
--msgstr ""
-+msgstr "Hurtig"
- 
- #. HPIJS options
- #: ../ppdippstr.py:254
-@@ -1565,23 +1576,23 @@ msgstr "Kladde (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:258
- msgid "Draft (Color cartridge)"
--msgstr ""
-+msgstr "Kladde (farvepatron)"
- 
- #: ../ppdippstr.py:260
- msgid "Draft grayscale (Black cartridge)"
--msgstr ""
-+msgstr "Kladde i gråtoner (sort patron)"
- 
- #: ../ppdippstr.py:262
- msgid "Draft grayscale (auto-detect-paper type)"
--msgstr "Kladde sort/hvid (autodetektér papirtype)"
-+msgstr "Kladde i gråtoner (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:264
- msgid "Normal (Color cartridge)"
--msgstr ""
-+msgstr "Normal (farvepatron)"
- 
- #: ../ppdippstr.py:266
- msgid "Normal grayscale (Black cartridge)"
--msgstr ""
-+msgstr "Normal gråtoneskala (sort patron)"
- 
- #: ../ppdippstr.py:268
- msgid "Normal (auto-detect-paper type)"
-@@ -1589,7 +1600,7 @@ msgstr "Normal (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:270
- msgid "Normal grayscale (auto-detect-paper type)"
--msgstr "Normal sort/hvid (autodetektér papirtype)"
-+msgstr "Normal gråtoneskala (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:272
- msgid "High quality (auto-detect-paper type)"
-@@ -1597,15 +1608,15 @@ msgstr "Høj kvalitet (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:274
- msgid "High quality grayscale (auto-detect-paper type)"
--msgstr "Høj kvalitet sort/hvid (autodetektér papirtype)"
-+msgstr "Høj kvalitet, gråtoneskala (autodetektér papirtype)"
- 
- #: ../ppdippstr.py:276
- msgid "High quality (Color cartridge)"
--msgstr ""
-+msgstr "Høj kvalitet (farvepatron)"
- 
- #: ../ppdippstr.py:278
- msgid "High quality grayscale (Black cartridge)"
--msgstr ""
-+msgstr "Høj kvalitet, gråtoneskala (sort patron)"
- 
- #: ../ppdippstr.py:279
- msgid "Photo (on photo paper)"
-@@ -1613,7 +1624,7 @@ msgstr "Foto (på fotopapir)"
- 
- #: ../ppdippstr.py:280
- msgid "Photo (Color cartridge, on photo paper)"
--msgstr ""
-+msgstr "Foto (farvepatron, på fotopapir)"
- 
- #: ../ppdippstr.py:282
- msgid "Best quality (color on photo paper)"
-@@ -1660,7 +1671,6 @@ msgid "Manual feeder"
- msgstr "Manuel arkindføring"
- 
- #: ../ppdippstr.py:295
--#, fuzzy
- msgid "Multi-purpose tray "
- msgstr "Multifunktionsbakke"
- 
-@@ -1674,7 +1684,7 @@ msgstr "Tilpasset"
- 
- #: ../ppdippstr.py:299
- msgid "Letter"
--msgstr ""
-+msgstr "Letter"
- 
- #: ../ppdippstr.py:300
- msgid "Photo or 4x6 inch index card"
-@@ -1734,55 +1744,55 @@ msgstr "Kontrolleret af \"Udskriftstilstand\""
- 
- #: ../ppdippstr.py:318
- msgid "300 dpi, Color, Color Cartr."
--msgstr ""
-+msgstr "300 dpi, farve, farvepatron"
- 
- #: ../ppdippstr.py:320
- msgid "300 dpi, color, black + color cartridge"
--msgstr "300 dpi, farve, sort + farve blækpatron"
-+msgstr "300 dpi, farve, sort + farvepatron"
- 
- #: ../ppdippstr.py:322
- msgid "300 dpi, Draft, Color, Color Cartr."
--msgstr ""
-+msgstr "300 dpi, kladde, farve, farvepatron"
- 
- #: ../ppdippstr.py:324
- msgid "300 dpi, draft, color, black + color cartridge"
--msgstr "300 dpi, kladde, farve, sort + farve blækpatron"
-+msgstr "300 dpi, kladde, farve, sort + farvepatron"
- 
- #: ../ppdippstr.py:326
- msgid "300 dpi, Draft, Grayscale, Black Cartr."
--msgstr ""
-+msgstr "300 dpi, kladde, gråtoneskala, sort patron"
- 
- #: ../ppdippstr.py:328
- msgid "300 dpi, Grayscale, Black Cartr."
--msgstr ""
-+msgstr "300 dpi, gråtoneskala, sort patron"
- 
- #: ../ppdippstr.py:330
- msgid "300 dpi, draft, grayscale, black + color cartridge"
--msgstr "300 dpi, kladde, sort/hvid, sort + farve blækpatron"
-+msgstr "300 dpi, kladde, gråtoneskala, sort + farvepatron"
- 
- #: ../ppdippstr.py:332
- msgid "300 dpi, grayscale, black + color cartridge"
--msgstr "300 dpi, sort/hvid, sort + farve blækpatron"
-+msgstr "300 dpi, gråtoneskala, sort + farvepatron"
- 
- #: ../ppdippstr.py:334
- msgid "600 dpi, color, black + color cartridge"
--msgstr "600 dpi, farve, sort + farve blækpatron"
-+msgstr "600 dpi, farve, sort + farvepatron"
- 
- #: ../ppdippstr.py:336
- msgid "600 dpi, grayscale, black + color cartridge"
--msgstr "600 dpi, sort/hvid, sort + farve blækpatron"
-+msgstr "600 dpi, gråtoneskala, sort + farvepatron"
- 
- #: ../ppdippstr.py:338
- msgid "600 dpi, photo, black + color cartridge, photo paper"
--msgstr "600 dpi, foto, sort + farve blækpatron, fotopapir"
-+msgstr "600 dpi, foto, sort + farvepatron, fotopapir"
- 
- #: ../ppdippstr.py:340
- msgid "600 dpi, color, black + color cartridge, photo paper, normal"
--msgstr "600 dpi, farve, sort + farve blækpatron, fotopapir, normal"
-+msgstr "600 dpi, farve, sort + farvepatron, fotopapir, normal"
- 
- #: ../ppdippstr.py:342
- msgid "1200 dpi, photo, black + color cartridge, photo paper"
--msgstr "1200 dpi, foto, sort + farve blækpatron, fotopapir"
-+msgstr "1200 dpi, foto, sort + farvepatron, fotopapir"
- 
- #: ../ppdippstr.py:349
- msgid "Internet Printing Protocol (ipp)"
-@@ -2173,15 +2183,15 @@ msgstr "_Duplikér"
- 
- #: ../system-config-printer.py:294
- msgid "Set As De_fault"
--msgstr "Sæt som st_andard"
-+msgstr "S_æt som standard"
- 
- #: ../system-config-printer.py:298
- msgid "_Create class"
--msgstr "_Opret klasse"
-+msgstr "O_pret klasse"
- 
- #: ../system-config-printer.py:300
- msgid "View Print _Queue"
--msgstr "Vis udskrifts_kø"
-+msgstr "_Vis udskriftskø"
- 
- #: ../system-config-printer.py:304
- msgid "E_nabled"
-@@ -2189,7 +2199,7 @@ msgstr "_Aktiveret"
- 
- #: ../system-config-printer.py:306
- msgid "_Shared"
--msgstr "_Delt"
-+msgstr "De_lt"
- 
- #: ../system-config-printer.py:311
- msgid "Description"
-@@ -2904,17 +2914,18 @@ msgstr "<b>Licensvilkår</b>"
- msgid "Driver details"
- msgstr "Driverdetaljer"
- 
-+# Tilbage til forrige dialog
- #: ../ui/NewPrinterWindow.ui.h:103
- msgid "_Back"
--msgstr "_Tilbage"
-+msgstr "_Forrige"
- 
- #: ../ui/NewPrinterWindow.ui.h:105 ../ui/PrinterPropertiesDialog.ui.h:3
- msgid "_Apply"
--msgstr "_Anvend"
-+msgstr "An_vend"
- 
- #: ../ui/NewPrinterWindow.ui.h:106
- msgid "_Forward"
--msgstr "_Fremad"
-+msgstr "_Næste"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:1
- msgid "Printer Properties"
-@@ -3124,17 +3135,18 @@ msgstr "Udskriftskvalitet:"
- msgid "Printer resolution:"
- msgstr "Printeropløsning:"
- 
-+# Microsoft
- #: ../ui/PrinterPropertiesDialog.ui.h:64
- msgid "Output bin:"
--msgstr "Outputspand:"
-+msgstr "Outputbakke:"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:65
- msgid "100"
--msgstr ""
-+msgstr "100"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:66
- msgid "50"
--msgstr ""
-+msgstr "50"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:67
- msgid "Reset"
-@@ -3146,7 +3158,7 @@ msgstr "Mere"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:69
- msgid "1"
--msgstr ""
-+msgstr "1"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:70
- msgid "<b>Common Options</b>"
-@@ -3174,11 +3186,11 @@ msgstr "Gamma:"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:76
- msgid "0"
--msgstr ""
-+msgstr "0"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:77
- msgid "1000"
--msgstr ""
-+msgstr "1000"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:78
- msgid "<b>Image Options</b>"
-@@ -3222,11 +3234,11 @@ msgstr "Kolonner:"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:88
- msgid "10.00"
--msgstr ""
-+msgstr "10,00"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:89
- msgid "6.40"
--msgstr ""
-+msgstr "6,40"
- 
- #: ../ui/PrinterPropertiesDialog.ui.h:90
- msgid "points"
-@@ -4013,5 +4025,5 @@ msgid ""
- "For each queue, you can adjust the default page size and other driver "
- "options, as well as seeing ink/toner levels and status messages."
- msgstr ""
--"Du kan justere standard-sidestørrelse og andre driver-indstillinger for hver "
--"kø, såvel som at se blæk-/toner-niveauer og statusbeskeder."
-+"Du kan justere standardsidestørrelse og andre driverindstillinger for hver "
-+"kø, såvel som se blæk-/tonerniveauer og statusbeskeder."
--- 
-2.25.1
-
diff --git a/Update-de.po.patch b/Update-de.po.patch
deleted file mode 100644
index b7494882d16cb3f7cff48fcc9de15c460f0dd6a0..0000000000000000000000000000000000000000
--- a/Update-de.po.patch
+++ /dev/null
@@ -1,559 +0,0 @@
-From c20c5693dfce759851aedb9e8f0e732e7dcb8544 Mon Sep 17 00:00:00 2001
-From: Ettore Atalan <atalanttore@googlemail.com>
-Date: Mon, 23 Apr 2018 22:28:47 +0200
-Subject: [PATCH] Update de.po
-
-Improved german translation.
----
- po/de.po | 165 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 82 insertions(+), 83 deletions(-)
-
-diff --git a/po/de.po b/po/de.po
-index 42627508..4f3b0424 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -21,13 +21,14 @@
- # Tim Waugh <twaugh@redhat.com>, 2011
- # Roman Spirgi <rspirgi@gmail.com>, 2015. #zanata
- # Zdenek Dohnal <zdohnal@redhat.com>, 2016. #zanata
-+# Ettore Atalan <atalanttore@googlemail.com>, 2018
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2018-01-23 10:27+0100\n"
--"PO-Revision-Date: 2016-10-24 07:16-0400\n"
--"Last-Translator: Zdenek Dohnal <zdohnal@redhat.com>\n"
-+"PO-Revision-Date: 2018-04-23 22:10+0200\n"
-+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
- "Language-Team: German (http://www.transifex.com/projects/p/system-config-"
- "printer/language/de/)\n"
- "Language: de\n"
-@@ -1036,11 +1037,11 @@ msgstr "Allgemein"
- #. HP
- #: ../ppdippstr.py:97
- msgid "Print Quality"
--msgstr ""
-+msgstr "Druckqualität"
- 
- #: ../ppdippstr.py:98
- msgid "Automatic"
--msgstr ""
-+msgstr "Automatisch"
- 
- #: ../ppdippstr.py:100
- msgid "Printing Quality"
-@@ -1072,11 +1073,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:107
- msgid "Best"
--msgstr ""
-+msgstr "Beste"
- 
- #: ../ppdippstr.py:108
- msgid "High-Resolution Photo"
--msgstr ""
-+msgstr "Hochauflösendes Foto"
- 
- #: ../ppdippstr.py:109
- msgid "Fast Draft"
-@@ -1084,15 +1085,15 @@ msgstr ""
- 
- #: ../ppdippstr.py:111
- msgid "Installed Cartridges"
--msgstr ""
-+msgstr "Installierte Patronen"
- 
- #: ../ppdippstr.py:112 ../ppdippstr.py:113
- msgid "Fast Only"
--msgstr ""
-+msgstr "Nur schnell"
- 
- #: ../ppdippstr.py:114
- msgid "Photo Only"
--msgstr ""
-+msgstr "Nur Foto"
- 
- #: ../ppdippstr.py:115
- msgid "Black and TriColor"
-@@ -1104,11 +1105,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:118
- msgid "Resolution"
--msgstr ""
-+msgstr "Auflösung"
- 
- #: ../ppdippstr.py:120
- msgid "Color Mode"
--msgstr ""
-+msgstr "Farbmodus"
- 
- #: ../ppdippstr.py:121
- msgid "Hight Quality Grayscale"
-@@ -1120,20 +1121,19 @@ msgstr ""
- 
- #: ../ppdippstr.py:124
- msgid "Quality"
--msgstr ""
-+msgstr "Qualität"
- 
- #: ../ppdippstr.py:125
--#, fuzzy
- msgid "High Resolution "
--msgstr "Auflösung des Druckers:"
-+msgstr "Hohe Auflösung "
- 
- #: ../ppdippstr.py:126
- msgid "Paper source"
--msgstr ""
-+msgstr "Papierzufuhr"
- 
- #: ../ppdippstr.py:127
- msgid "Auto Source"
--msgstr ""
-+msgstr "Automatische Zufuhr"
- 
- #: ../ppdippstr.py:128
- msgid "Manual Feed"
-@@ -1169,7 +1169,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:137
- msgid "Media Type"
--msgstr ""
-+msgstr "Medientyp"
- 
- #: ../ppdippstr.py:138
- msgid "Bond"
-@@ -1177,19 +1177,19 @@ msgstr ""
- 
- #: ../ppdippstr.py:139
- msgid "Color"
--msgstr ""
-+msgstr "Farbe"
- 
- #: ../ppdippstr.py:140
- msgid "Envelope"
--msgstr ""
-+msgstr "Umschlag"
- 
- #: ../ppdippstr.py:141
- msgid "Labels"
--msgstr ""
-+msgstr "Etiketten"
- 
- #: ../ppdippstr.py:142
- msgid "Standard Paper"
--msgstr ""
-+msgstr "Standardpapier"
- 
- #: ../ppdippstr.py:143
- msgid "Heavy"
-@@ -1201,11 +1201,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:145
- msgid "Recycled"
--msgstr ""
-+msgstr "Wiederverwertet"
- 
- #: ../ppdippstr.py:146
- msgid "Transparency"
--msgstr ""
-+msgstr "Transparenz"
- 
- #: ../ppdippstr.py:147
- msgid "Plain Paper"
-@@ -1217,7 +1217,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:149
- msgid "Photo Paper)"
--msgstr ""
-+msgstr "Fotopapier)"
- 
- #: ../ppdippstr.py:150
- msgid "Transparency Film"
-@@ -1229,7 +1229,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:152
- msgid "Print Density"
--msgstr ""
-+msgstr "Druckdichte"
- 
- #: ../ppdippstr.py:153
- msgid "Extra Light (1)"
-@@ -1237,15 +1237,15 @@ msgstr ""
- 
- #: ../ppdippstr.py:154
- msgid "Light (2)"
--msgstr ""
-+msgstr "Hell (2)"
- 
- #: ../ppdippstr.py:155
- msgid "Medium (3)"
--msgstr ""
-+msgstr "Mittel (3)"
- 
- #: ../ppdippstr.py:156
- msgid "Dark (4)"
--msgstr ""
-+msgstr "Dunkel (4)"
- 
- #: ../ppdippstr.py:157
- msgid "Extra Dark (5)"
-@@ -1253,11 +1253,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:158
- msgid "Copies"
--msgstr ""
-+msgstr "Kopien"
- 
- #: ../ppdippstr.py:160
- msgid "Adjustment"
--msgstr ""
-+msgstr "Anpassung"
- 
- #: ../ppdippstr.py:161
- msgid "Halftone Algorithm"
-@@ -1265,7 +1265,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:164
- msgid "Miscellaneous"
--msgstr ""
-+msgstr "Diverses"
- 
- #: ../ppdippstr.py:165
- msgid "N-up Orientation"
-@@ -1277,28 +1277,28 @@ msgstr ""
- 
- #: ../ppdippstr.py:167
- msgid "Landscape"
--msgstr ""
-+msgstr "Landschaft"
- 
- #: ../ppdippstr.py:168
- msgid "Seascape"
--msgstr ""
-+msgstr "Seelandschaft"
- 
- #: ../ppdippstr.py:169
- msgid "Media Size"
--msgstr ""
-+msgstr "Mediengröße"
- 
- #: ../ppdippstr.py:170
- msgid "Output Mode"
--msgstr ""
-+msgstr "Ausgabemodus"
- 
- #: ../ppdippstr.py:171
- msgid "Grayscale"
--msgstr ""
-+msgstr "Graustufen"
- 
- #. Brother
- #: ../ppdippstr.py:174
- msgid "Two-Sided"
--msgstr ""
-+msgstr "Zweiseitig"
- 
- #: ../ppdippstr.py:175 ../system-config-printer.desktop.in.h:1
- #: ../system-config-printer.appdata.xml.in.h:1
-@@ -1307,60 +1307,60 @@ msgstr "Druckeinstellungen"
- 
- #: ../ppdippstr.py:176
- msgid "Print Settings  (Advanced)"
--msgstr ""
-+msgstr "Druckeinstellungen (Erweitert)"
- 
- #: ../ppdippstr.py:177
- msgid "Color Settings"
--msgstr ""
-+msgstr "Farbeinstellungen"
- 
- #: ../ppdippstr.py:178
- msgid "Color Settings (Advanced)"
--msgstr ""
-+msgstr "Farbeinstellungen (Erweitert)"
- 
- #: ../ppdippstr.py:179
- msgid "Brightness"
--msgstr ""
-+msgstr "Helligkeit"
- 
- #: ../ppdippstr.py:180
- msgid "Contrast"
--msgstr ""
-+msgstr "Kontrast"
- 
- #: ../ppdippstr.py:181
- msgid "Red"
--msgstr ""
-+msgstr "Rot"
- 
- #: ../ppdippstr.py:182
- msgid "Green"
--msgstr ""
-+msgstr "Grün"
- 
- #: ../ppdippstr.py:183
- msgid "Blue"
--msgstr ""
-+msgstr "Blau"
- 
- #. Epson xp serie
- #: ../ppdippstr.py:186
- msgid "_Media Size"
--msgstr ""
-+msgstr "_Mediengröße"
- 
- #: ../ppdippstr.py:187
- msgid "_Grayscale"
--msgstr ""
-+msgstr "_Graustufen"
- 
- #: ../ppdippstr.py:188
- msgid "_Brightness"
--msgstr ""
-+msgstr "_Helligkeit"
- 
- #: ../ppdippstr.py:189
- msgid "_Contrast"
--msgstr ""
-+msgstr "_Kontrast"
- 
- #: ../ppdippstr.py:190
- msgid "_Saturation"
--msgstr ""
-+msgstr "_Sättigung"
- 
- #: ../ppdippstr.py:191
- msgid "On"
--msgstr ""
-+msgstr "Ein"
- 
- #. Options
- #: ../ppdippstr.py:193 ../printerproperties.py:957
-@@ -1369,20 +1369,20 @@ msgstr "Installierbare Optionen"
- 
- #: ../ppdippstr.py:194
- msgid "Duplexer Installed"
--msgstr ""
-+msgstr "Duplexer installiert"
- 
- #. Canon
- #: ../ppdippstr.py:197
- msgid "Color Model"
--msgstr ""
-+msgstr "Farbmodell"
- 
- #: ../ppdippstr.py:198
- msgid "Color Precision"
--msgstr ""
-+msgstr "Farbgenauigkeit"
- 
- #: ../ppdippstr.py:199
- msgid "Resolution "
--msgstr ""
-+msgstr "Auflösung "
- 
- #: ../ppdippstr.py:200
- msgid "Printer Features Common"
-@@ -1394,7 +1394,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:202
- msgid "Ink Type"
--msgstr ""
-+msgstr "Tintenart"
- 
- #: ../ppdippstr.py:203
- msgid "Toner Save "
-@@ -1402,15 +1402,15 @@ msgstr ""
- 
- #: ../ppdippstr.py:204
- msgid "ON"
--msgstr ""
-+msgstr "EIN"
- 
- #: ../ppdippstr.py:205
- msgid "Toner Density"
--msgstr ""
-+msgstr "Tonerdichte"
- 
- #: ../ppdippstr.py:206
- msgid "Media Type "
--msgstr ""
-+msgstr "Medientyp "
- 
- #: ../ppdippstr.py:207
- msgid "Collate "
-@@ -1422,15 +1422,15 @@ msgstr ""
- 
- #: ../ppdippstr.py:209
- msgid "Halftones "
--msgstr ""
-+msgstr "Halbtöne "
- 
- #: ../ppdippstr.py:210
- msgid "Duplex"
--msgstr ""
-+msgstr "Duplex"
- 
- #: ../ppdippstr.py:211
- msgid "OFF"
--msgstr ""
-+msgstr "AUS"
- 
- #: ../ppdippstr.py:212
- msgid "ON (Long-edged Binding)"
-@@ -1443,23 +1443,23 @@ msgstr ""
- #. Samsung
- #: ../ppdippstr.py:215
- msgid "Paper Size"
--msgstr ""
-+msgstr "Papiergröße"
- 
- #: ../ppdippstr.py:216
- msgid "Paper Type"
--msgstr ""
-+msgstr "Papierart"
- 
- #: ../ppdippstr.py:217
- msgid "Thin"
--msgstr ""
-+msgstr "Dünn"
- 
- #: ../ppdippstr.py:218
- msgid "Thick"
--msgstr ""
-+msgstr "Dick"
- 
- #: ../ppdippstr.py:219
- msgid "Thicker"
--msgstr ""
-+msgstr "Dicker"
- 
- #: ../ppdippstr.py:220
- msgid "Edge Enhance"
-@@ -1479,15 +1479,15 @@ msgstr ""
- 
- #: ../ppdippstr.py:225 ../ppdippstr.py:228
- msgid "Long Edge"
--msgstr ""
-+msgstr "Lange Seite"
- 
- #: ../ppdippstr.py:226 ../ppdippstr.py:229
- msgid "Short Edge"
--msgstr ""
-+msgstr "Kurze Seite"
- 
- #: ../ppdippstr.py:227
- msgid "Two-sided"
--msgstr ""
-+msgstr "Zweiseitig"
- 
- #. Ricoh
- #: ../ppdippstr.py:232
-@@ -1516,11 +1516,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:238
- msgid "Not Installed"
--msgstr ""
-+msgstr "Nicht installiert"
- 
- #: ../ppdippstr.py:239
- msgid "Installed"
--msgstr ""
-+msgstr "Installiert"
- 
- #: ../ppdippstr.py:240
- msgid "PageSize"
-@@ -1548,7 +1548,7 @@ msgstr ""
- 
- #: ../ppdippstr.py:246
- msgid "Destination"
--msgstr ""
-+msgstr "Ziel"
- 
- #: ../ppdippstr.py:247 ../printerproperties.py:282
- msgid "Staple"
-@@ -1564,11 +1564,11 @@ msgstr ""
- 
- #: ../ppdippstr.py:250
- msgid "Gradation"
--msgstr ""
-+msgstr "Abstufung"
- 
- #: ../ppdippstr.py:251
- msgid "Fast"
--msgstr ""
-+msgstr "Schnell"
- 
- #. HPIJS options
- #: ../ppdippstr.py:254
-@@ -1581,7 +1581,7 @@ msgstr "Entwurf (automatische Papiererkennung)"
- 
- #: ../ppdippstr.py:258
- msgid "Draft (Color cartridge)"
--msgstr ""
-+msgstr "Entwurf (Farbpatrone)"
- 
- #: ../ppdippstr.py:260
- msgid "Draft grayscale (Black cartridge)"
-@@ -1593,7 +1593,7 @@ msgstr "Entwurf, Graustufen (automatische Papiererkennung)"
- 
- #: ../ppdippstr.py:264
- msgid "Normal (Color cartridge)"
--msgstr ""
-+msgstr "Normal (Farbpatrone)"
- 
- #: ../ppdippstr.py:266
- msgid "Normal grayscale (Black cartridge)"
-@@ -1617,7 +1617,7 @@ msgstr "Hohe Qualität in Graustufen (automatische Papiererkennung)"
- 
- #: ../ppdippstr.py:276
- msgid "High quality (Color cartridge)"
--msgstr ""
-+msgstr "Hohe Qualität (Farbpatrone)"
- 
- #: ../ppdippstr.py:278
- msgid "High quality grayscale (Black cartridge)"
-@@ -1676,9 +1676,8 @@ msgid "Manual feeder"
- msgstr "Manueller Einzug"
- 
- #: ../ppdippstr.py:295
--#, fuzzy
- msgid "Multi-purpose tray "
--msgstr "Multifunktionsschacht"
-+msgstr "Multifunktionsschacht "
- 
- #: ../ppdippstr.py:297
- msgid "Page size"
-@@ -1726,7 +1725,7 @@ msgstr "CD oder DVD 120mm"
- 
- #: ../ppdippstr.py:309
- msgid "Double-sided printing"
--msgstr "Duplexdruck"
-+msgstr "Doppelseitiger Druck"
- 
- #: ../ppdippstr.py:310
- msgid "Long edge (standard)"
-@@ -1750,7 +1749,7 @@ msgstr "Gesteuert durch »Druckmodus«"
- 
- #: ../ppdippstr.py:318
- msgid "300 dpi, Color, Color Cartr."
--msgstr ""
-+msgstr "300 DPI, Farbe, Farbpatrone"
- 
- #: ../ppdippstr.py:320
- msgid "300 dpi, color, black + color cartridge"
-@@ -1758,7 +1757,7 @@ msgstr "300 DPI, Farbe, Schwarz + Farbpatrone"
- 
- #: ../ppdippstr.py:322
- msgid "300 dpi, Draft, Color, Color Cartr."
--msgstr ""
-+msgstr "300 DPI, Entwirf, Farbe, Farbpatrone"
- 
- #: ../ppdippstr.py:324
- msgid "300 dpi, draft, color, black + color cartridge"
--- 
-2.25.1
-
diff --git a/Use-ValueError-instead-of-ImportError-to-catch-excep.patch b/Use-ValueError-instead-of-ImportError-to-catch-excep.patch
deleted file mode 100644
index abd607505a252040c797246bb23a69734fdb2e7a..0000000000000000000000000000000000000000
--- a/Use-ValueError-instead-of-ImportError-to-catch-excep.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 96e1f5b242f4be5b20d408e6f526caaaecf34a48 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Mon, 26 Feb 2018 11:17:22 +0100
-Subject: [PATCH] Use ValueError instead of ImportError to catch
- exception when importing GIR bindings
-
-When importing specific version of GIR bindings, the ValueError
-exception is raised instead of ImportError.
-
-This should make libsecret optional as intended
-
-Fixes: #94
----
- jobviewer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jobviewer.py b/jobviewer.py
-index 6d9309ff..16b20300 100644
---- a/jobviewer.py
-+++ b/jobviewer.py
-@@ -57,7 +57,7 @@ try:
-     gi.require_version('Secret', '1')
-     from gi.repository import Secret
-     USE_SECRET=True
--except ImportError:
-+except ValueError:
-     USE_SECRET=False
- 
- import gettext
--- 
-2.25.1
-
diff --git a/system-config-printer-1.5.18.tar.xz b/system-config-printer-1.5.18.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..e06d4b3fbd0079bf5953957d2a8c7fd15a057745
Binary files /dev/null and b/system-config-printer-1.5.18.tar.xz differ
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 02035e912083c9c2cbd9cdf7f08d0f9b3b12a2d9..51e9cd1b6362867ddea7e2d09505b58aecbeb366 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,33 +1,47 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-
 Name:           system-config-printer
 Summary:        a graphical tool for CUPS administration
-Version:        1.5.11
-Release:        25
-License:        GPLv2+
-URL:            https://github.com/zdohnal/system-config-printer
-Source0:        https://github.com/zdohnal/system-config-printer/archive/%{version}.tar.gz
-BuildRequires:  libusb1-devel gcc gettext-devel systemd xmlto systemd-devel
-BuildRequires:  intltool cups-devel >= 1.2 desktop-file-utils >= 0.2.92 pkgconfig(glib-2.0)
-BuildRequires:  python3-devel
-Requires:       desktop-file-utils >= 0.2.92 python3-dbus%{?_isa} gtk3%{?_isa} python3-gobject%{?_isa}
-Requires:       libnotify%{?_isa} python3-cairo%{?_isa} python3-cups >= 1.9.60 libcanberra-gtk3
-Requires:       python3-firewall PackageKit-gtk3-module desktop-notification-daemon dbus-x11
-Requires:       python3-pycurl gobject-introspection python3-gobject  python3-dbus python3-requests
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Version:        1.5.18
+Release:        1
+License:        GPL-2.0-or-later
+URL:            https://github.com/OpenPrinting/system-config-printer
+Source0:        https://github.com/OpenPrinting/system-config-printer/releases/download/v%{version}/%{name}-%{version}.tar.xz
+
+Patch0001: 0001-fix-system-config-printer-Fix-interface-translation.patch
+Patch6001: 6001-Fix-debugprint-in-options.py-fixes-291.patch
+Patch6002: 6002-udev-Fix-exit-value-when-device-is-already-handled.patch
+
+BuildRequires: autoconf-archive
+BuildRequires: cups-devel >= 1.2
+BuildRequires: desktop-file-utils >= 0.2.92
+BuildRequires: gcc
+BuildRequires: gettext-devel
+BuildRequires: intltool
+BuildRequires: make
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libudev) >= 172
+BuildRequires: pkgconfig(libusb-1.0)
+BuildRequires: pkgconfig(systemd)
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: xmlto
+BuildRequires: gobject-introspection-devel
+Requires: dbus-x11
+Requires: desktop-notification-daemon
+Requires: python3-cairo%{?_isa}
+Requires: python3-dbus%{?_isa}
+Requires: python3-firewall
+
+Requires: python3-gobject%{?_isa}
+%{?systemd_requires}
+Recommends: PackageKit
+Recommends: PackageKit-glib
+Suggests: python3-smbc
+
 Obsoletes:      %{name}-libs = %{version}-%{release} %{name}-applet = %{version}-%{release}
 Obsoletes:      %{name}-udev = %{version}-%{release} hal-cups-utils < 0.6.20
 Provides:       %{name}-libs = %{version}-%{release} %{name}-applet = %{version}-%{release}
 Provides:       %{name}-udev = %{version}-%{release} hal-cups-utils = 0.6.20
 
-Patch1:         Fix-constructing-the-auth-dialog.patch
-Patch2:         Use-ValueError-instead-of-ImportError-to-catch-excep.patch
-Patch3:         Fix-typo.patch
-Patch4:         Update-da.po.patch
-Patch5:         Update-de.po.patch
-
 %description
 %{name} is a graphical tool for CUPS administration. It
 uses IPP to configure a CUPS server.
@@ -40,44 +54,41 @@ uses IPP to configure a CUPS server.
 sed -i 's/setup.py install --prefix=$(DESTDIR)$(prefix)/setup.py install --root $(DESTDIR) --prefix=$(prefix)/' Makefile*
 
 %build
-./bootstrap
 %configure --with-udev-rules
 %make_build
 
 %install
-%make_install DESTDIR=%buildroot
+%make_install
 
-install -d %buildroot%{_localstatedir}/run/udev-configure-printer
+%{__mkdir_p} %buildroot%{_localstatedir}/run/udev-configure-printer
 touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 
-%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}
+# Manually invoke the python byte compile macro for each path that
+# needs byte compilation
+%py_byte_compile %{__python3} %{buildroot}/%{_datadir}/system-config-printer
 
 %find_lang %{name}
 
 %files -f  %{name}.lang
 %license COPYING
-%{_bindir}/%{name}
-%{_bindir}/install-printerdriver
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/%{name}.appdata.xml
-%{_bindir}/%{name}-applet
-%{_sysconfdir}/xdg/autostart/print-applet.desktop
-%{_prefix}/lib/udev/rules.d/*.rules
-%{_prefix}/lib/udev/udev-*-printer
-%ghost %dir %{_localstatedir}/run/udev-configure-printer
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
-%{_unitdir}/configure-printer@.service
+%{_bindir}/*
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
-%{_bindir}/scp-dbus-service
+%{_datadir}/%{name}
 %dir %{_sysconfdir}/cupshelpers
 %config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
-%{python3_sitelib}/cupshelpers-1.0-py%{python3_version}.egg-info/*
-%{python3_sitelib}/cupshelpers/*
+%{python3_sitelib}/cupshelpers
+%{python3_sitelib}/*.egg-info
+%{_sysconfdir}/xdg/autostart/print-applet.desktop
+%{_prefix}/lib/udev/rules.d/*.rules
+%{_prefix}/lib/udev/udev-*-printer
+%ghost %dir %{_localstatedir}/run/udev-configure-printer
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
+%{_unitdir}/configure-printer@.service
+%{_datadir}/applications/system-config-printer.desktop
+%{_datadir}/metainfo/%{name}.appdata.xml
 
 %files help
 %doc po/ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD
@@ -89,6 +100,9 @@ rm -rf /var/cache/foomatic/foomatic.pickle
 exit 0
 
 %changelog
+* Sun Jul 13 2025 Funda Wang <fundawang@yeah.net> - 1.5.18-1
+- update to 1.5.18
+
 * Mon Dec 23 2024 misaka00251 <liuxin@iscas.ac.cn> - 1.5.11-25
 - Fix build failed on riscv64
 
diff --git a/system-config-printer.yaml b/system-config-printer.yaml
index f50e0a6b14a919af0e7cec75ab13a0102d185a3a..25215c96205701d244673353c619ab301734e146 100644
--- a/system-config-printer.yaml
+++ b/system-config-printer.yaml
@@ -1,4 +1,4 @@
 version_control: github
-src_repo: zdohnal/system-config-printer
-tag_prefix: ^
-seperator: .
+src_repo: OpenPrinting/system-config-printer
+tag_prefix: ^v
+separator: .