diff options
| author | l10n daemon script <[email protected]> | 2022-03-05 01:48:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-05 01:48:28 +0000 |
| commit | 3366f62b0979752249a7e38769c318c72100aac6 (patch) | |
| tree | d037bdc8305f8eaf3b175248236860ad842eb1cf /src/settings | |
| parent | 62f1897e592bbc0976e178ed07fc4faa5451a0cd (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 161e5b612..c322d0449 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -46,7 +46,7 @@ Name[sr@ijekavianlatin]=Dolphinova navigacija Name[sr@latin]=Dolphinova navigacija Name[sv]=Dolphin navigering Name[ta]=டால்பின் உலாவல் -Name[tr]=Dolphin Gezintisi +Name[tr]=Dolphin Dolaşımı Name[uk]=«Навігація» Dolphin Name[vi]=Điều hướng Dolphin Name[x-test]=xxDolphin Navigationxx @@ -99,7 +99,7 @@ Comment[sr@ijekavianlatin]=Ovaj servis omogućava podešavanje navigacije u Dolp 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[ta]=டால்பினின் உலாவல் அமைப்புகளை அமைக்க இந்த சேவை உதவும். -Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar. +Comment[tr]=Bu servis Dolphin dolaşımını 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 @@ -161,7 +161,7 @@ Name[sr@ijekavianlatin]=Navigacija Name[sr@latin]=Navigacija Name[sv]=Navigering Name[ta]=உலாவல் -Name[tr]=Gezinti +Name[tr]=Dolaşım Name[uk]=Навігація Name[vi]=Điều hướng Name[x-test]=xxNavigationxx |