diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
| commit | 9c43e3de7d989bed1798c8f529136316e1b45e0c (patch) | |
| tree | 4ab597d91a1f266e215259f734aa3d930300d497 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | d6f95521b332a701a61d799eb2fd89c8d5ede7c7 (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, 0 insertions, 4 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 10e806a81..86c5e0f27 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -41,7 +41,6 @@ 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 服务 Name[zh_TW]=Dolphin 服務 @@ -99,7 +98,6 @@ Name[sr@latin]=Servisi Name[sv]=Tjänster Name[tr]=Servisler Name[uk]=Служби -Name[x-test]=xxServicesxx Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services @@ -145,7 +143,6 @@ 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]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager @@ -192,6 +189,5 @@ 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]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 |