diff options
| author | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-23 02:29:46 +0000 |
| commit | 696414069907b41f7738e3212ac0d68b58fed1bc (patch) | |
| tree | e8310c09c5892090b93d9878e3b89ceafce1c4cc /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | 943af95605c480fef0f98cbfabbabdef04d743dc (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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index dd69975f1..954ad991f 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -99,7 +99,7 @@ Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати навігацію у Dolphin. Comment[vi]=Dịch vụ này cho phép cấu hình điều hướng Dolphin. Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。 +Comment[zh_CN]=此服务用于配置 Dolphin 的导航功能。 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。 [Desktop Entry] @@ -212,7 +212,7 @@ Comment[tr]=Dosya yöneticisi gezintisini yapılandır Comment[uk]=Налаштувати навігацію у менеджері файлів Comment[vi]=Cấu hình điều hướng trình quản lí tệp Comment[x-test]=xxConfigure file manager navigationxx -Comment[zh_CN]=配置文件管理器导航 +Comment[zh_CN]=配置文件管理器导航功能 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات |