From 9493c9a210e13f0775f32e7172490e0d6ee0a4b8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Mar 2021 07:54:06 +0100 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" --- dataengines/devicenotifications/devicenotifications.notifyrc | 2 ++ kcms/desktoptheme/plasma-themes.knsrc | 1 + login-sessions/plasmax11.desktop.cmake | 1 + wallpapers/image/wallpaper-mobile.knsrc | 1 + wallpapers/image/wallpaper.knsrc | 1 + 5 files changed, 6 insertions(+) diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc index 465762ed2..1dcb979e1 100644 --- a/dataengines/devicenotifications/devicenotifications.notifyrc +++ b/dataengines/devicenotifications/devicenotifications.notifyrc @@ -73,6 +73,7 @@ Name[uk]=Сповіщення про пристрої Name[vi]=Trình thông báo thiết bị Name[wa]=Notifiaedje d' éndjin Name[x-test]=xxDevice Notifierxx +Name[zh_CN]=设备通知器 Name[zh_TW]=裝置通知 IconName=device-notifier @@ -96,5 +97,6 @@ Name[sv]=Enhetsstatus Name[uk]=Стан пристрою Name[vi]=Trạng thái thiết bị Name[x-test]=xxDevice Statusxx +Name[zh_CN]=设备状态 Sound=Oxygen-Sys-App-Message.ogg Action=Sound diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 1856282be..feb7c14f9 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -13,6 +13,7 @@ Name[sv]=Plasmateman Name[uk]=Теми Плазми Name[vi]=Chủ đề Plasma Name[x-test]=xxPlasma Themesxx +Name[zh_CN]=Plasma 主题 ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Plasma Theme diff --git a/login-sessions/plasmax11.desktop.cmake b/login-sessions/plasmax11.desktop.cmake index 084ad3959..86c1f87a3 100644 --- a/login-sessions/plasmax11.desktop.cmake +++ b/login-sessions/plasmax11.desktop.cmake @@ -7,6 +7,7 @@ Name=Plasma (X11) Name[ast]=Plasma (X11) Name[az]=Plasma (X11) Name[ca]=Plasma (X11) +Name[de]=Plasma (X11) Name[en_GB]=Plasma (X11) Name[es]=Plasma (X11) Name[eu]=Plasma (X11) diff --git a/wallpapers/image/wallpaper-mobile.knsrc b/wallpapers/image/wallpaper-mobile.knsrc index 88cb661ba..fa9fa352e 100644 --- a/wallpapers/image/wallpaper-mobile.knsrc +++ b/wallpapers/image/wallpaper-mobile.knsrc @@ -35,6 +35,7 @@ Name[tr]=Duvar Kağıtları Name[uk]=Зображення тла Name[vi]=Phông nền Name[x-test]=xxWallpapersxx +Name[zh_CN]=壁纸 Name[zh_TW]=桌布 ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc index 2285013e1..d2c028ada 100644 --- a/wallpapers/image/wallpaper.knsrc +++ b/wallpapers/image/wallpaper.knsrc @@ -35,6 +35,7 @@ Name[tr]=Duvar Kağıtları Name[uk]=Зображення тла Name[vi]=Phông nền Name[x-test]=xxWallpapersxx +Name[zh_CN]=壁纸 Name[zh_TW]=桌布 ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml