Package: systemsettings
Version: 4:5.14.5-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for systemsettings (versioned as 4:5.14.5-1.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
On behalf of Debian Chinese Team and KDE translation team for zh_CN
(Simplified Chinese), I'm proposing a patch to fix a zh_CN translation error
within systemsettings.desktop. Nothing else is touched.
This issue is fixed upstream with the release of Plasma 5.15. Please drop this
patch after we package Plasma 5.15 into Debian.
Regards.
diff -Nru systemsettings-5.14.5/debian/changelog systemsettings-
5.14.5/debian/changelog
--- systemsettings-5.14.5/debian/changelog 2019-01-24 07:26:17.0
-0500
+++ systemsettings-5.14.5/debian/changelog 2019-02-23 12:45:05.0
-0500
@@ -1,3 +1,11 @@
+systemsettings (4:5.14.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry-pick from upstream trunk to fix a bug in zh_CN
+(Simplified Chinese) .desktop file translation.
+
+ -- Boyuan Yang Sat, 23 Feb 2019 12:45:05 -0500
+
systemsettings (4:5.14.5-1) unstable; urgency=medium
* New upstream release (5.14.5).
diff -Nru systemsettings-5.14.5/debian/patches/0001-systemsettings.desktop-
Fix-zh_CN-translation-bug-in-.patch systemsettings-5.14.5/debian/patches/0001-
systemsettings.desktop-Fix-zh_CN-translation-bug-in-.patch
--- systemsettings-5.14.5/debian/patches/0001-systemsettings.desktop-Fix-
zh_CN-translation-bug-in-.patch 1969-12-31 19:00:00.0 -0500
+++ systemsettings-5.14.5/debian/patches/0001-systemsettings.desktop-Fix-
zh_CN-translation-bug-in-.patch 2019-02-23 12:44:59.0 -0500
@@ -0,0 +1,39 @@
+From: Boyuan Yang
+Date: Sat, 23 Feb 2019 12:36:41 -0500
+Subject: Fix 5.14.x zh_CN translation bug in desktop file
+
+Applied-Upstream:
https://cgit.kde.org/systemsettings.git/commit/?id=da729d548b78c6d32c44e7769337901c989cf1d4
+
+The Simplified Chinese translation for systemsettings.desktop has two major
+translation errors in GenericName[zh_CN] and Name[zh_CN]. They exist in
+Plasma 5.14.x branch but are fixed in trunk and 5.15.x branch.
+This patch cherry-picks the fix.
+
+Signed-off-by: Boyuan Yang
+
+---
+ app/systemsettings.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/systemsettings.desktop b/app/systemsettings.desktop
+index 5a1faf5..dfe9833 100755
+--- a/app/systemsettings.desktop
b/app/systemsettings.desktop
+@@ -84,7 +84,7 @@ GenericName[uz]=Tizim moslamalari
+ GenericName[uz@cyrillic]=Тизим мосламалари
+ GenericName[wa]=Apontiaedjes do sistinme
+ GenericName[x-test]=xxSystem Settingsxx
+-GenericName[zh_CN]=System Settings,系统设置
++GenericName[zh_CN]=系统设置
+ GenericName[zh_TW]=系統設定
+
+ Name=System Settings
+@@ -169,7 +169,7 @@ Name[uz]=Tizim moslamalari
+ Name[uz@cyrillic]=Тизим мосламалари
+ Name[wa]=Apontiaedjes do sistinme
+ Name[x-test]=xxSystem Settingsxx
+-Name[zh_CN]=System Settings,系统设置
++Name[zh_CN]=系统设置
+ Name[zh_TW]=系統設定
+
+ Comment=Configuration tools for your computer
diff -Nru systemsettings-5.14.5/debian/patches/series systemsettings-
5.14.5/debian/patches/series
--- systemsettings-5.14.5/debian/patches/series 1969-12-31 19:00:00.0
-0500
+++ systemsettings-5.14.5/debian/patches/series 2019-02-23 12:37:00.0
-0500
@@ -0,0 +1 @@
+0001-systemsettings.desktop-Fix-zh_CN-translation-bug-in-.patch
signature.asc
Description: This is a digitally signed message part
