diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (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, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index eeb28fe86..1db09c88a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -43,6 +43,7 @@ Name[sr@latin]=Dolphinova navigacija Name[sv]=Dolphin navigering Name[tr]=Dolphin Gezintisi Name[uk]=«Навігація» Dolphin +Name[vi]=Điều hướng Dolphin Name[x-test]=xxDolphin Navigationxx Name[zh_CN]=Dolphin 导航 Name[zh_TW]=Dolphin 導覽 @@ -89,6 +90,7 @@ 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[vi]=Dịch vụ này cho phép cấu hình điều hướng Dolphin. Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。 @@ -149,6 +151,7 @@ Name[sr@latin]=Navigacija Name[sv]=Navigering Name[tr]=Gezinti Name[uk]=Навігація +Name[vi]=Điều hướng Name[x-test]=xxNavigationxx Name[zh_CN]=导航 Name[zh_TW]=導覽 @@ -196,6 +199,7 @@ 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[vi]=Cấu hình điều hướng trình quản lí tập tin Comment[x-test]=xxConfigure file manager navigationxx Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 @@ -244,6 +248,7 @@ 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[vi]=file manager,trình quản lí tập tin X-KDE-Keywords[x-test]=xxfile managerxx X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 |