From 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Apr 2018 07:09:04 +0200 Subject: 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" --- src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 67e6ff39c..148d167da 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -9,6 +9,7 @@ Name[el]=Dolphin Λειτουργίες Προβολής Name[en_GB]=Dolphin View Modes Name[es]=Modos de vistas de Dolphin Name[et]=Dolphini vaaterežiimid +Name[eu]=Dolphin ikuspegi moduak Name[fi]=Dolphin – näkymät Name[fr]=Modes d'affichage de Dolphin Name[gl]=Modos de vista de Dolphin @@ -51,6 +52,7 @@ Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφ Comment[en_GB]=This service allows configuration of the Dolphin view modes. Comment[es]=Este servicio permite configurar los modos de las vistas de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini vaaterežiime. +Comment[eu]=Zerbitzu honek Dolphinen ikuspegi moduak konfiguratzeko balio du. 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. @@ -103,6 +105,7 @@ Name[el]=Λειτουργίες Προβολής Name[en_GB]=View Modes Name[es]=Modos de vistas Name[et]=Vaaterežiimid +Name[eu]=Ikuspegi moduak Name[fi]=Näkymät Name[fr]=Modes d'affichage Name[gl]=Modos de vista @@ -145,6 +148,7 @@ Comment[el]=Διαμόρφωση των λειτουργιών προβολής Comment[en_GB]=Configure file manager view modes Comment[es]=Configura los modos de vistas del gestor de archivos Comment[et]=Failihalduri vaaterežiimide seadistamine +Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak 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. @@ -188,6 +192,7 @@ X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur +X-KDE-Keywords[eu]=Fitxategi-kudeatzailea X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros -- cgit v1.3