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 2023-02-23 02:01:06 +00:00
parent da26deaa5c
commit 5d60f218d4

View file

@ -121,3 +121,4 @@ X-Plasma-Runner-Syntax-Descriptions[uk]=Знаходить вікна, чия н
X-Plasma-Runner-Syntax-Descriptions[vi]=Tìm các ca s mà tên hoc ng dng khp vi :q:. Có th tương tác vi các ca s bng cách dùng mt trong các t khoá: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above và keep below.,Tìm các ca s bàn làm vic có tên :q:,Chuyn sang bàn làm vic có tên :q:,Lit kê tt c các ca s và cho phép kích hot chúng.,Lit kê tt c các bàn làm vic khác và cho phép chuyn sang chúng.
X-Plasma-Runner-Syntax-Descriptions[x-test]=xxFinds windows whose name or window application match :q:. It is possible to interact with the windows by using one of the following keywords: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above and keep below.,Finds windows which are on desktop named :q:,Switch to desktop named :q:,Lists all windows and allows to activate them.,Lists all other desktops and allows to switch to them.xx
X-Plasma-Runner-Syntax-Descriptions[zh_CN]= :q: 使activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above keep below :q: :q:
X-Plasma-Runner-Syntax-Descriptions[zh_TW]= :q: 使activateclosemin minimizemax maximizefullscreenshadekeep above keep below, :q: , :q: ,,