From 5d60f218d4d8058e7ac69b48e979f2ae1725806c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2023 02:01:06 +0000 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" --- src/plugins/krunner-integration/kwin-runner-windows.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/krunner-integration/kwin-runner-windows.desktop b/src/plugins/krunner-integration/kwin-runner-windows.desktop index 3a694f7546..e7a04b6799 100644 --- a/src/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop @@ -121,3 +121,4 @@ X-Plasma-Runner-Syntax-Descriptions[uk]=Знаходить вікна, чия н X-Plasma-Runner-Syntax-Descriptions[vi]=Tìm các cửa sổ mà tên hoặc ứng dụng khớp với :q:. Có thể tương tác với các cửa sổ bằng cách dùng một trong các từ khoá: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above và keep below.,Tìm các cửa sổ ở bàn làm việc có tên :q:,Chuyển sang bàn làm việc có tên :q:,Liệt kê tất cả các cửa sổ và cho phép kích hoạt chúng.,Liệt kê tất cả các bàn làm việc khác và cho phép chuyển 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: 的視窗。可以使用以下關鍵字來控制視窗：activate（設為作用中）、close（關閉）、min 或 minimize（最小化）、max 或 maximize（最大化）、fullscreen（全螢幕）、shade（收起）、keep above（維持在最上方）、以及 keep below（維持在最下方）。,尋找在名為 :q: 的桌面的視窗,切換到名為 :q: 的桌面,列出所有視窗並允許將它們設為作用中。,列出所有其他的桌面並允許將切換到它們。