diff options
| author | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
| commit | c9770e60839f60ffa29e56e9785a9a36b3d4a90c (patch) | |
| tree | 6e191d096a8388e677e7dc3556aa77daf7ac1964 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 2a18f450254e5d58152e747fbc150747cd34e218 (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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index e70eeba2e..840a273e2 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -7,6 +7,7 @@ Name[es]=Servicios de Dolphin Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin +Name[hu]=Dolphin szolgáltatások Name[ia]=Servicios de Dolphin Name[id]=Layanan Dolphin Name[it]=Servizi di Dolphin @@ -51,6 +52,7 @@ Name[es]=Servicios Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos +Name[hu]=Szolgáltatások Name[ia]=Servicios Name[id]=Layanan Name[it]=Servizi @@ -84,6 +86,7 @@ Comment[es]=Configurar los servicios del gestor de archivos Comment[fi]=Tiedostonhallinnan palveluasetukset Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. +Comment[hu]=A fájlkezelő szolgáltatásainak beállítása Comment[ia]=Configura servicios del gerente de file Comment[id]=Konfigurasi layanan manajer berkas Comment[it]=Configura i servizi del gestore dei file @@ -118,6 +121,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[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=manajer berkas X-KDE-Keywords[it]=gestore dei file |