From e76bf5cb18ca46a0adc84ead3801726814cf6fd3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Aug 2021 01:28:23 +0000 Subject: 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/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 1a7557e56..c652f0d39 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -97,7 +97,7 @@ Comment[tr]=Bu servis Dolphin görünüm kiplerini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати режими перегляду Dolphin. Comment[vi]=Dịch vụ này cho phép cấu hình các chế độ xem Dolphin. Comment[x-test]=xxThis service allows configuration of the Dolphin view modes.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。 +Comment[zh_CN]=此服务用于配置 Dolphin 的视图模式。 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。 [Desktop Entry] -- cgit v1.3