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"
11 years ago · 8847a8c575
parent 9e5f357a89
commit 8847a8c575
1 changed files with 1 additions and 0 deletions
--- a/ksmserver/screenlocker/kcm/screenlocker.desktop
+++ b/ksmserver/screenlocker/kcm/screenlocker.desktop
@ -103,3 +103,4 @@ X-KDE-Keywords[sr@latin]=lock,resume,screensaver,screenlock,zaključavanje,nasta
 X-KDE-Keywords[sv]=lås,återuppta,skärmsläckare,skärmlåsning
 X-KDE-Keywords[uk]=lock,resume,screensaver,screenlock,блокування,замикання,відновлення,зберігач екрана,екран,блокування екрана
 X-KDE-Keywords[x-test]=xxlockxx,xxresumexx,xx screensaverxx,xx screenlockxx
+X-KDE-Keywords[zh_CN]=lock,resume, screensaver, screenlock,锁定,恢复,屏幕保护,屏幕锁