diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 6eccee850..b504901b7 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -42,6 +42,7 @@ Name[sr@latin]=Dolphinovi servisi Name[sv]=Dolphin tjänster Name[tr]=Dolphin Servisleri Name[uk]=Служби Dolphin +Name[vi]=Các dịch vụ Dolphin Name[x-test]=xxDolphin Servicesxx Name[zh_CN]=Dolphin 服务 Name[zh_TW]=Dolphin 服務 @@ -101,6 +102,7 @@ Name[sr@latin]=Servisi Name[sv]=Tjänster Name[tr]=Servisler Name[uk]=Служби +Name[vi]=Các dịch vụ Name[x-test]=xxServicesxx Name[zh_CN]=服务 Name[zh_TW]=服務 @@ -147,6 +149,7 @@ Comment[sr@latin]=Podešavanje servisa menadžera fajlova Comment[sv]=Anpassa filhanterarens tjänster Comment[tr]=Dosya yöneticisi servislerini yapılandır Comment[uk]=Налаштувати служби менеджера файлів +Comment[vi]=Cấu hình các dịch vụ trình quản lí tập tin Comment[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 @@ -195,6 +198,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли +X-KDE-Keywords[vi]=file manager,trình quản lí tập tin X-KDE-Keywords[x-test]=xxfile managerxx X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 |