diff options
| author | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
| commit | 586252341ea69a60b64f404dd23ef93e59c1e16c (patch) | |
| tree | bfd5fff0b27bdddf74a438798e6c3f9f56590a5e /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | 0c7da668e724490b894b4d174b36d4be6002afc9 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 7e64f841b..5f220f640 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. Comment[ja]=Dolphin でのナビゲーションを設定します Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją. +Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. |