diff options
| author | l10n daemon script <[email protected]> | 2021-08-23 01:28:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-23 01:28:23 +0000 |
| commit | e76bf5cb18ca46a0adc84ead3801726814cf6fd3 (patch) | |
| tree | 53737c03bc7f77280530c85095972d04ca7063e4 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 37d415cedceaad5bf8b009d9c91b8a89bd1f139b (diff) | |
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index d6bb34581..fecb72eba 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -99,7 +99,7 @@ Comment[tr]=Bu servis genel Dolphin ayarlarını 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 thiết lập chung của Dolphin. Comment[x-test]=xxThis service allows configuration of general Dolphin settings.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。 +Comment[zh_CN]=此服务用于配置 Dolphin 的常规设置。 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。 [Desktop Entry] |