diff options
| author | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
| commit | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (patch) | |
| tree | ce9a944a91afa36aee45fbd19695eef720e7fb42 /src/settings/kcm/kcmdolphinviewmodes.desktop | |
| parent | ece6650ecd3af0eb450e28a9aadcb0f4dd26cb24 (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/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index ac79626f8..85edc20ce 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -8,6 +8,7 @@ Name[fr]=Modes d'affichage de Dolphin Name[gl]=Modos de vista de Dolphin Name[id]=Mode Tampilan Dolphin Name[it]=Viste di Dolphin +Name[ja]=Dolphin 表示モード Name[ko]=Dolphin 보기 모드 Name[nb]=Dolphin visningsmåter Name[nl]=Dolphin-weergavemodussen @@ -36,6 +37,7 @@ Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin. Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin. Comment[it]=Questo servizio permette di configurare le viste di Dolphin. +Comment[ja]=Dolphin の表示モードを設定します Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. @@ -72,6 +74,7 @@ Name[fr]=Modes d'affichage Name[gl]=Modos de vista Name[id]=Mode Tampilan Name[it]=Viste +Name[ja]=表示モード Name[ko]=보기 모드 Name[nb]=Visningsmåter Name[nl]=Weergavemodi @@ -100,6 +103,7 @@ Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers Comment[gl]=Configurar os modos de vista do xestor de ficheiros. Comment[id]=Konfigurasi mode tampilan manajer berkas Comment[it]=Configura le viste del gestore dei file +Comment[ja]=ファイルマネージャの表示モードを設定します Comment[ko]=파일 관리자 보기 모드 설정 Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nl]=Bestandsbeheerderweergavemodussen configureren |