┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.desktop
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2015-04-26 09:44:42 +0000
committerl10n daemon script <[email protected]>2015-04-26 09:44:42 +0000
commit06776451a72c395fca4b40196a6617366167ad66 (patch)
tree5aa85d73868c4ca5733b5dc02aef7738e7d39291 /src/settings/kcm/kcmdolphingeneral.desktop
parent0daae5336714c2124171ca89415eb8bf6098519d (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.desktop9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index c57bcf38d..cdc096277 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -8,11 +8,14 @@ Name[fr]=Dolphin général
Name[gl]=Xerais de Dolphin
Name[id]=Dolphin Umum
Name[it]=Impostazioni generali di Dolphin
+Name[ko]=Dolphin 일반
+Name[nb]=Dolphin generelt
Name[nl]=Dolphin algemeen
Name[nn]=Generelt for Dolphin
Name[pl]=Ustawienia Dolphina
Name[pt]=Geral do Dolphin
Name[pt_BR]=Geral do Dolphin
+Name[se]=Dolphinoppalaččat
Name[sk]=Všeobecný Dolphin
Name[sl]=Dolphin - splošno
Name[sr]=Делфиново опште
@@ -33,6 +36,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[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.
+Comment[ko]=이 서비스는 일반 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.
@@ -69,6 +73,8 @@ Name[fr]=Général
Name[gl]=Xerais
Name[id]=Umum
Name[it]=Generale
+Name[ko]=일반
+Name[nb]=Generelt
Name[nl]=Algemeen
Name[nn]=Generelt
Name[pl]=Ogólne
@@ -94,6 +100,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[id]=Konfigurasi pengaturan manajer berkas umum
Comment[it]=Configura le impostazioni generali del gestore dei file
+Comment[ko]=일반 파일 관리자 설정
Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
Comment[pl]=Ustawienia ogólne zarządzania plikami
Comment[pt]=Configurar as definições gerais do gestor de ficheiros
@@ -118,6 +125,8 @@ X-KDE-Keywords[fr]=gestionnaire de fichiers
X-KDE-Keywords[gl]=xestor de ficheiros
X-KDE-Keywords[id]=manajer berkas
X-KDE-Keywords[it]=gestore dei file
+X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[nb]=filbehandler
X-KDE-Keywords[nl]=bestandsbeheerder
X-KDE-Keywords[nn]=filhandsamar
X-KDE-Keywords[pl]=zarządzanie plikami