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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index fab72ef57..f2547264c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -7,6 +7,7 @@ Name[es]=Navegación de Dolphin Name[fi]=Dolphin – selaus Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin +Name[hu]=Dolphin: Navigáció Name[ia]=Navigation de Dolphin Name[id]=Navigasi Dolphin Name[it]=Navigazione di Dolphin @@ -42,6 +43,7 @@ Comment[es]=Este servicio permite configurar la navegación de Dolphin. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. Comment[fr]=Ce service permet de configurer la navigation avec Dolphin. Comment[gl]=Este servizo permite configurar a navegación de Dolphin. +Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin navigálásának beállítását. Comment[ia]=Iste servicio permitte le configuration del navigation de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin. Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. @@ -86,6 +88,7 @@ Name[es]=Navegación Name[fi]=Selaus Name[fr]=Navigation Name[gl]=Navegación +Name[hu]=Navigálás Name[ia]=Navigation Name[id]=Navigasi Name[it]=Navigazione @@ -121,6 +124,7 @@ Comment[es]=Configurar la navegación del gestor de archivos Comment[fi]=Tiedostonhallinnan selausasetukset Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[gl]=Configurar a navegación do xestor de ficheiros. +Comment[hu]=A fájlkezelő navigálásának beállítása Comment[ia]=Configura navigation del gerente de file Comment[id]=Konfigurasi navigasi manajer berkas Comment[it]=Configura la navigazione col gestore dei file @@ -156,6 +160,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 |