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"
This commit is contained in:
l10n daemon script 2022-11-25 01:51:47 +00:00
parent 9e97c7383c
commit 738820d438

View file

@ -35,7 +35,13 @@
"Description[zh_CN]": "配置触摸屏滑动手势",
"Description[zh_TW]": "設定觸控螢幕滑動手勢",
"Icon": "preferences-desktop-gestures-touch",
"Name": "Touchscreen Gestures"
"Name": "Touchscreen Gestures",
"Name[ar]": "إيماءات شاشة اللمس",
"Name[ca@valencia]": "Gestos de pantalla tàctil",
"Name[ca]": "Gestos de pantalla tàctil",
"Name[eu]": "Ukimen-pantailako keinuak",
"Name[tr]": "Dokunmatik Ekran Hareketleri",
"Name[x-test]": "xxTouchscreen Gesturesxx"
},
"X-DocPath": "kcontrol/kwintouchscreen/index.html",
"X-KDE-Keywords": "kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen",