diff options
| author | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
| commit | 8b12612bbf8ae4500a84634087a074d94a495eec (patch) | |
| tree | 2f32689ede0d74a38b7e81c88629e4419c41bf0f /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | a72543484b1358b29a06f2f45b065ad822981738 (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 771ea0b41..70e422cf3 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -25,6 +25,7 @@ Name[sv]=Dolphin tjänster Name[uk]=Служби Dolphin Name[x-test]=xxDolphin Servicesxx Name[zh_CN]=Dolphin 服务 +Name[zh_TW]=Dolphin 服務 [Desktop Entry] Icon=services @@ -63,6 +64,7 @@ Name[sv]=Tjänster Name[uk]=Служби Name[x-test]=xxServicesxx Name[zh_CN]=服务 +Name[zh_TW]=服務 Comment=Configure file manager services Comment[ca]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů @@ -92,6 +94,7 @@ Comment[sv]=Anpassa filhanterarens tjänster Comment[uk]=Налаштувати служби менеджера файлів Comment[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 +Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů @@ -120,3 +123,4 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_TW]=檔案管理員 |