From 1c1efb983c60ea57422317186047f744e23df114 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Jun 2015 11:19:31 +0000 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/kcmdolphinservices.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 2f09e5dfe..07f64df1e 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -3,6 +3,7 @@ Name[ca]=Serveis del Dolphin Name[cs]=Služby Dolphinu Name[de]=Dolphin-Dienste Name[en_GB]=Dolphin Services +Name[es]=Servicios de Dolphin Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin @@ -43,6 +44,7 @@ Name[ca]=Serveis Name[cs]=Služby Name[de]=KDE-Dienste Name[en_GB]=Services +Name[es]=Servicios Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos @@ -72,6 +74,7 @@ Comment[ca]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů Comment[de]=Dateiverwaltungs-Dienste einrichten Comment[en_GB]=Configure file manager services +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. @@ -102,6 +105,7 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[en_GB]=file manager +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 -- cgit v1.3.1