diff options
| author | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
| commit | 98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e (patch) | |
| tree | 4572b3604d0e83ff75e3f98a8e2c94c7b7339857 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 736c9958e7b97ac651a8d7074fd74650ddb5f1ab (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index e29706d10..0660fe587 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -149,7 +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[vi]=Cấu hình các dịch vụ trình quản lí tệp Comment[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 |