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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index fd649b548..d1f07be19 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -42,7 +42,6 @@ Name[sr@latin]=Dolphinova navigacija Name[sv]=Dolphin navigering Name[tr]=Dolphin Gezintisi Name[uk]=«Навігація» Dolphin -Name[x-test]=xxDolphin Navigationxx Name[zh_CN]=Dolphin 导航 Name[zh_TW]=Dolphin 導覽 Comment=This service allows configuration of the Dolphin navigation. @@ -88,7 +87,6 @@ Comment[sr@latin]=Ovaj servis omogućava podešavanje navigacije u Dolphinu. Comment[sv]=Den här tjänsten låter dig anpassa navigering i Dolphin. Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати навігацію у Dolphin. -Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。 @@ -147,7 +145,6 @@ Name[sr@latin]=Navigacija Name[sv]=Navigering Name[tr]=Gezinti Name[uk]=Навігація -Name[x-test]=xxNavigationxx Name[zh_CN]=导航 Name[zh_TW]=導覽 Comment=Configure file manager navigation @@ -194,7 +191,6 @@ Comment[sr@latin]=Podešavanje navigacije u menadžeru fajlova Comment[sv]=Anpassa filhanterarens navigering Comment[tr]=Dosya yöneticisi gezintisini yapılandır Comment[uk]=Налаштувати навігацію у менеджері файлів -Comment[x-test]=xxConfigure file manager navigationxx Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager @@ -241,6 +237,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]=檔案管理員 |