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"
5 years ago · 9493c9a210
parent db69eb09d7
commit 9493c9a210
5 changed files with 6 additions and 0 deletions
--- 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
--- 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
--- 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)
--- 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
--- 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