From 22bbf12e6c96a6266eb6686cef657295ac248d11 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Nov 2023 03:51:16 +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" --- shell/metadata.desktop.cmake | 2 +- shell/package/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake index 7f533e390..470dbb2a7 100644 --- a/shell/metadata.desktop.cmake +++ b/shell/metadata.desktop.cmake @@ -98,7 +98,7 @@ Keywords[sl]=shell Keywords[sv]=skal Keywords[uk]=оболонка Keywords[x-test]=xxshellxx -Keywords[zh_CN]=shell +Keywords[zh_CN]=shell;外壳程序;waikechengxu;壳;ke; Keywords[zh_TW]=shell Type=Service diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop index 1c0439062..c3b88d4af 100644 --- a/shell/package/metadata.desktop +++ b/shell/package/metadata.desktop @@ -98,7 +98,7 @@ Keywords[sl]=shell Keywords[sv]=skal Keywords[uk]=оболонка Keywords[x-test]=xxshellxx -Keywords[zh_CN]=shell +Keywords[zh_CN]=shell;外壳程序;waikechengxu;壳;ke; Keywords[zh_TW]=shell Type=Service