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/kcmdolphingeneral.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/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 68fc057a2..76f67fb5a 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus. +Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. @@ -112,6 +113,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas +Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros |