diff options
| author | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
| commit | da7a6a16f8f95d4328215e6f708b051a66899d88 (patch) | |
| tree | b3453c56f05896c91a037db6f95eda1cf72c6ab6 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | b07a63797b36c504959d632ff839a7ced1249dc1 (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 db3c58e72..fc685206b 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -25,6 +25,7 @@ Name[sr@ijekavian]=Делфинови сервиси Name[sr@ijekavianlatin]=Dolphinovi servisi Name[sr@latin]=Dolphinovi servisi Name[sv]=Dolphin tjänster +Name[tr]=Dolphin Servisleri Name[uk]=Служби Dolphin Name[x-test]=xxDolphin Servicesxx Name[zh_CN]=Dolphin 服务 @@ -67,6 +68,7 @@ Name[sr@ijekavian]=Сервиси Name[sr@ijekavianlatin]=Servisi Name[sr@latin]=Servisi Name[sv]=Tjänster +Name[tr]=Servisler Name[uk]=Служби Name[x-test]=xxServicesxx Name[zh_CN]=服务 @@ -99,6 +101,7 @@ Comment[sr@ijekavian]=Подешавање сервиса менаџера фа� Comment[sr@ijekavianlatin]=Podešavanje servisa menadžera fajlova 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[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 @@ -130,6 +133,7 @@ X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova 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[x-test]=xxfile managerxx X-KDE-Keywords[zh_CN]=file manager,文件管理器 |