[neon/backports-focal/kimageannotator/Neon/release-lts] debian/patches: begone foul patch

Harald Sitter null at kde.org
Fri Feb 12 10:54:18 GMT 2021


Git commit 4e36ea7f2a5efacea265f541dbb0ff32aa188849 by Harald Sitter.
Committed on 12/02/2021 at 10:54.
Pushed by sitter into branch 'Neon/release-lts'.

begone foul patch

doesn't apply on 0.4 anymore. chances are it's also not needed

D  +0    -529  debian/patches/0001-make-zh_CN-translation-working.patch
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-focal/kimageannotator/commit/4e36ea7f2a5efacea265f541dbb0ff32aa188849

diff --git a/debian/patches/0001-make-zh_CN-translation-working.patch b/debian/patches/0001-make-zh_CN-translation-working.patch
deleted file mode 100644
index aa34e10..0000000
--- a/debian/patches/0001-make-zh_CN-translation-working.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-From: Boyuan Yang <byang at debian.org>
-Date: Mon, 12 Oct 2020 13:16:40 -0400
-Subject: make zh_CN translation working
-
-Applied-Upstream: https://github.com/ksnip/kImageAnnotator/commit/dfbf80508d901dc6e4f3516b34ccc7443678613e
-Forwarded: https://github.com/ksnip/ksnip/issues/429
----
- translations/CMakeLists.txt             |   2 +-
- translations/kImageAnnotator_zh_CN.ts   | 245 ++++++++++++++++++++++++++++++++
- translations/kImageAnnotator_zh_Hans.ts | 245 --------------------------------
- 3 files changed, 246 insertions(+), 246 deletions(-)
- create mode 100644 translations/kImageAnnotator_zh_CN.ts
- delete mode 100644 translations/kImageAnnotator_zh_Hans.ts
-
-diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
-index f9b5ef7..f0b72a8 100644
---- a/translations/CMakeLists.txt
-+++ b/translations/CMakeLists.txt
-@@ -22,7 +22,7 @@ set(KIMAGEANNOTATOR_LANG_TS
- 	kImageAnnotator_sv.ts
- 	kImageAnnotator_tr.ts
- 	kImageAnnotator_uk.ts
--	kImageAnnotator_zh_Hans.ts)
-+        kImageAnnotator_zh_CN.ts)
- 
- if (DEFINED UPDATE_TS_FILES)
- 	qt5_create_translation(KIMAGEANNOTATOR_LANG_QM ${CMAKE_SOURCE_DIR}/translations ${KIMAGEANNOTATOR_SRCS} ${KIMAGEANNOTATOR_LANG_TS} OPTIONS "-no-obsolete")
-diff --git a/translations/kImageAnnotator_zh_CN.ts b/translations/kImageAnnotator_zh_CN.ts
-new file mode 100644
-index 0000000..1294532
---- /dev/null
-+++ b/translations/kImageAnnotator_zh_CN.ts
-@@ -0,0 +1,245 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!DOCTYPE TS>
-+<TS version="2.1" language="zh_CN">
-+<context>
-+    <name>kImageAnnotator::AnnotationContextMenu</name>
-+    <message>
-+        <source>Arrange</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Bring to Front</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Bring Forward</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Send Backward</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Send to Back</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Select This</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Copy</source>
-+        <translation>复制</translation>
-+    </message>
-+    <message>
-+        <source>Paste</source>
-+        <translation>粘贴</translation>
-+    </message>
-+    <message>
-+        <source>Edit</source>
-+        <translation>编辑</translation>
-+    </message>
-+    <message>
-+        <source>Delete</source>
-+        <translation>删除</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::AnnotationSettings</name>
-+    <message>
-+        <source>Color</source>
-+        <translation>颜色</translation>
-+    </message>
-+    <message>
-+        <source>Width</source>
-+        <translation>宽度</translation>
-+    </message>
-+    <message>
-+        <source>Text Color</source>
-+        <translation>文本颜色</translation>
-+    </message>
-+    <message>
-+        <source>Font Size</source>
-+        <translation>字体大小</translation>
-+    </message>
-+    <message>
-+        <source>Border And Fill Visibility</source>
-+        <translation>边框和填充可见性</translation>
-+    </message>
-+    <message>
-+        <source>Starting Number</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Blur Radius</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Sticker</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::AnnotationTabContextMenu</name>
-+    <message>
-+        <source>Close</source>
-+        <translation>关闭</translation>
-+    </message>
-+    <message>
-+        <source>Close Other</source>
-+        <translation>关闭其它</translation>
-+    </message>
-+    <message>
-+        <source>Close All</source>
-+        <translation>关闭全部</translation>
-+    </message>
-+    <message>
-+        <source>Close All to the Left</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Close All to the Right</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::CropWidget</name>
-+    <message>
-+        <source>Crop</source>
-+        <translation>裁切</translation>
-+    </message>
-+    <message>
-+        <source>Cancel</source>
-+        <translation>取消</translation>
-+    </message>
-+    <message>
-+        <source>X:</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Y:</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>W:</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>H:</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::FillTypePicker</name>
-+    <message>
-+        <source>No Border and No Fill</source>
-+        <translation>无边框且无填充</translation>
-+    </message>
-+    <message>
-+        <source>Border and Fill</source>
-+        <translation>有边框且有填充</translation>
-+    </message>
-+    <message>
-+        <source>Border and No Fill</source>
-+        <translation>有边框且无填充</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::ScaleDialog</name>
-+    <message>
-+        <source>Scale Image</source>
-+        <translation>缩放图像</translation>
-+    </message>
-+    <message>
-+        <source>Keep Aspect Ratio</source>
-+        <translation>保持长宽比</translation>
-+    </message>
-+    <message>
-+        <source>Width:</source>
-+        <translation>宽度:</translation>
-+    </message>
-+    <message>
-+        <source>Height:</source>
-+        <translation>高度:</translation>
-+    </message>
-+    <message>
-+        <source>OK</source>
-+        <translation>确定</translation>
-+    </message>
-+    <message>
-+        <source>Cancel</source>
-+        <translation>取消</translation>
-+    </message>
-+    <message>
-+        <source>Pixel</source>
-+        <translation>像素</translation>
-+    </message>
-+    <message>
-+        <source>Percent</source>
-+        <translation>百分比</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>kImageAnnotator::ToolPicker</name>
-+    <message>
-+        <source>Select</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Pen</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Number</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Marker Rectangle</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Marker Ellipse</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Marker Pen</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Text</source>
-+        <translation>文本</translation>
-+    </message>
-+    <message>
-+        <source>Arrow</source>
-+        <translation>箭头</translation>
-+    </message>
-+    <message>
-+        <source>Double Arrow</source>
-+        <translation>双箭头</translation>
-+    </message>
-+    <message>
-+        <source>Line</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Blur</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Rectangle</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Ellipse</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Number Pointer</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <source>Sticker</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+</context>
-+</TS>
-diff --git a/translations/kImageAnnotator_zh_Hans.ts b/translations/kImageAnnotator_zh_Hans.ts
-deleted file mode 100644
-index d585d55..0000000
---- a/translations/kImageAnnotator_zh_Hans.ts
-+++ /dev/null
-@@ -1,245 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<!DOCTYPE TS>
--<TS version="2.1" language="zh_Hans">
--<context>
--    <name>kImageAnnotator::AnnotationContextMenu</name>
--    <message>
--        <source>Arrange</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Bring to Front</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Bring Forward</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Send Backward</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Send to Back</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Select This</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Copy</source>
--        <translation>复制</translation>
--    </message>
--    <message>
--        <source>Paste</source>
--        <translation>粘贴</translation>
--    </message>
--    <message>
--        <source>Edit</source>
--        <translation>编辑</translation>
--    </message>
--    <message>
--        <source>Delete</source>
--        <translation>删除</translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::AnnotationSettings</name>
--    <message>
--        <source>Color</source>
--        <translation>颜色</translation>
--    </message>
--    <message>
--        <source>Width</source>
--        <translation>宽度</translation>
--    </message>
--    <message>
--        <source>Text Color</source>
--        <translation>文本颜色</translation>
--    </message>
--    <message>
--        <source>Font Size</source>
--        <translation>字体大小</translation>
--    </message>
--    <message>
--        <source>Border And Fill Visibility</source>
--        <translation>边框和填充可见性</translation>
--    </message>
--    <message>
--        <source>Starting Number</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Blur Radius</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Sticker</source>
--        <translation type="unfinished"></translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::AnnotationTabContextMenu</name>
--    <message>
--        <source>Close</source>
--        <translation>关闭</translation>
--    </message>
--    <message>
--        <source>Close Other</source>
--        <translation>关闭其它</translation>
--    </message>
--    <message>
--        <source>Close All</source>
--        <translation>关闭全部</translation>
--    </message>
--    <message>
--        <source>Close All to the Left</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Close All to the Right</source>
--        <translation type="unfinished"></translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::CropWidget</name>
--    <message>
--        <source>Crop</source>
--        <translation>裁切</translation>
--    </message>
--    <message>
--        <source>Cancel</source>
--        <translation>取消</translation>
--    </message>
--    <message>
--        <source>X:</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Y:</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>W:</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>H:</source>
--        <translation type="unfinished"></translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::FillTypePicker</name>
--    <message>
--        <source>No Border and No Fill</source>
--        <translation>无边框且无填充</translation>
--    </message>
--    <message>
--        <source>Border and Fill</source>
--        <translation>有边框且有填充</translation>
--    </message>
--    <message>
--        <source>Border and No Fill</source>
--        <translation>有边框且无填充</translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::ScaleDialog</name>
--    <message>
--        <source>Scale Image</source>
--        <translation>缩放图像</translation>
--    </message>
--    <message>
--        <source>Keep Aspect Ratio</source>
--        <translation>保持长宽比</translation>
--    </message>
--    <message>
--        <source>Width:</source>
--        <translation>宽度:</translation>
--    </message>
--    <message>
--        <source>Height:</source>
--        <translation>高度:</translation>
--    </message>
--    <message>
--        <source>OK</source>
--        <translation>确定</translation>
--    </message>
--    <message>
--        <source>Cancel</source>
--        <translation>取消</translation>
--    </message>
--    <message>
--        <source>Pixel</source>
--        <translation>像素</translation>
--    </message>
--    <message>
--        <source>Percent</source>
--        <translation>百分比</translation>
--    </message>
--</context>
--<context>
--    <name>kImageAnnotator::ToolPicker</name>
--    <message>
--        <source>Select</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Pen</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Number</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Marker Rectangle</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Marker Ellipse</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Marker Pen</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Text</source>
--        <translation>文本</translation>
--    </message>
--    <message>
--        <source>Arrow</source>
--        <translation>箭头</translation>
--    </message>
--    <message>
--        <source>Double Arrow</source>
--        <translation>双箭头</translation>
--    </message>
--    <message>
--        <source>Line</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Blur</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Rectangle</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Ellipse</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Number Pointer</source>
--        <translation type="unfinished"></translation>
--    </message>
--    <message>
--        <source>Sticker</source>
--        <translation type="unfinished"></translation>
--    </message>
--</context>
--</TS>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b266f4c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-make-zh_CN-translation-working.patch


More information about the Neon-commits mailing list