┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphinviewmodes.desktop
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2015-06-16 13:31:20 +0000
committerl10n daemon script <[email protected]>2015-06-16 13:31:20 +0000
commita8a4981b2c58090c01cc96da933022909d6adf6b (patch)
tree05b8a39ae915503b8fe9b63b00d399a415d642d4 /src/settings/kcm/kcmdolphinviewmodes.desktop
parent1c1efb983c60ea57422317186047f744e23df114 (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.desktop5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 99a9965f2..e41b1cc16 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -7,6 +7,7 @@ Name[es]=Modos de vistas de Dolphin
Name[fi]=Dolphin – näkymät
Name[fr]=Modes d'affichage de Dolphin
Name[gl]=Modos de vista de Dolphin
+Name[ia]=Modos de vista de Dolphin
Name[id]=Mode Tampilan Dolphin
Name[it]=Viste di Dolphin
Name[ja]=Dolphin 表示モード
@@ -39,6 +40,7 @@ Comment[es]=Este servicio permite configurar los modos de las vistas de Dolphin.
Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia.
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[ia]=Iste servicio permitte configuration de le 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 の表示モードを設定します
@@ -80,6 +82,7 @@ Name[es]=Modos de vistas
Name[fi]=Näkymät
Name[fr]=Modes d'affichage
Name[gl]=Modos de vista
+Name[ia]=Modos de vista
Name[id]=Mode Tampilan
Name[it]=Viste
Name[ja]=表示モード
@@ -112,6 +115,7 @@ Comment[es]=Configura los modos de vistas del gestor de archivos
Comment[fi]=Tiedostonhallinnan katselutilojen asetukset
Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
+Comment[ia]=Configura le modos de vista del gerente de file
Comment[id]=Konfigurasi mode tampilan manajer berkas
Comment[it]=Configura le viste del gestore dei file
Comment[ja]=ファイルマネージャの表示モードを設定します
@@ -144,6 +148,7 @@ X-KDE-Keywords[es]=gestor de archivos
X-KDE-Keywords[fi]=tiedostonhallinta
X-KDE-Keywords[fr]=gestionnaire de fichiers
X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[ia]=gerente de file
X-KDE-Keywords[id]=manajer berkas
X-KDE-Keywords[it]=gestore dei file
X-KDE-Keywords[ko]=파일 관리자