diff options
| author | l10n daemon script <[email protected]> | 2019-07-31 05:06:34 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-07-31 05:06:34 +0200 |
| commit | 89239912d842d8b295360994b2c27c305cced30e (patch) | |
| tree | b60f2de8be9fba65fe14bd4f60900d82a02e5a0f /src/settings/kcm | |
| parent | 5bc8a93bfbaa25c6f1a50158f1662ee9fa741ff7 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 01163842b..ac3956144 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -61,7 +61,7 @@ Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphi Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin. Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin általános beállításainak módosítását. Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin. -Comment[id]=Layanan ini memungkinkan konfigurasi setelan umum Dolphin. +Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. @@ -162,7 +162,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. Comment[hu]=A fájlkezelő általános beállításainak módosítása Comment[ia]=Configura preferentias del gerente general de file -Comment[id]=Konfigurasikan setelan pengelola file umum +Comment[id]=Konfigurasikan pengaturan pengelola file umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 |