From 9d1f7cde61e3a6125d5899186dbcbac3f0774ca7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Nov 2022 01:49:41 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/effects/dialogparent/package/metadata.json | 1 + src/effects/dimscreen/package/metadata.json | 1 + src/effects/eyeonscreen/package/metadata.json | 1 + 3 files changed, 3 insertions(+) diff --git a/src/effects/dialogparent/package/metadata.json b/src/effects/dialogparent/package/metadata.json index 1ec6aeb23e..e2c1011692 100644 --- a/src/effects/dialogparent/package/metadata.json +++ b/src/effects/dialogparent/package/metadata.json @@ -67,6 +67,7 @@ "Name[uk]": "Батьківське вікно", "Name[vi]": "Cha hộp thoại", "Name[x-test]": "xxDialog Parentxx", + "Name[zh_CN]": "对话框父级窗口变暗", "Version": "0.1.0" }, "X-KDE-Ordering": "70", diff --git a/src/effects/dimscreen/package/metadata.json b/src/effects/dimscreen/package/metadata.json index 68270d7028..b9716ecf20 100644 --- a/src/effects/dimscreen/package/metadata.json +++ b/src/effects/dimscreen/package/metadata.json @@ -67,6 +67,7 @@ "Name[uk]": "Притлумлення кольорів у режимі адміністратора", "Name[vi]": "Làm tối màn hình cho chế độ quản trị viên", "Name[x-test]": "xxDim Screen for Administrator Modexx", + "Name[zh_CN]": "请求管理员模式时降低屏幕亮度", "Version": "1", "Website": "" }, diff --git a/src/effects/eyeonscreen/package/metadata.json b/src/effects/eyeonscreen/package/metadata.json index bb83002e44..3df1bd1ca8 100644 --- a/src/effects/eyeonscreen/package/metadata.json +++ b/src/effects/eyeonscreen/package/metadata.json @@ -67,6 +67,7 @@ "Name[uk]": "Око на екрані", "Name[vi]": "Theo dõi màn hình", "Name[x-test]": "xxEye on Screenxx", + "Name[zh_CN]": "窗口内收", "Version": "0.1.0" }, "X-KDE-Ordering": "50",