diff options
| author | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
| commit | e6dc4739c3c7373f203a27cde2e31f8de1811e3a (patch) | |
| tree | 9efbf8d07ef03e85bc43f5b88e934a69bdca4d2e /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | a516f46b44b0ac5b770a2065a9da15ba97d4a3b0 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 24bf0dff5..e0461db71 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -64,7 +64,7 @@ Comment[ia]=Iste servicio permitte le configuration del navigation de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin. Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. Comment[ja]=Dolphin でのナビゲーションを設定します -Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다. +Comment[ko]=이 서비스를 통해 Dolphin 탐색을 설정할 수 있습니다. Comment[lt]=Ši paslauga leidžia Dolphin naršymo konfigūravimą. Comment[ml]=ഡോള്ഫിന് നാവിഗേഷൻ ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. |