From a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Mar 2015 09:54:53 +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 d55f90e80..282642944 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -2,6 +2,7 @@ Name=Dolphin Services Name[ca]=Serveis del Dolphin Name[cs]=Služby Dolphinu Name[de]=Dolphin-Dienste +Name[en_GB]=Dolphin Services Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin @@ -35,6 +36,7 @@ Name=Services Name[ca]=Serveis Name[cs]=Služby Name[de]=KDE-Dienste +Name[en_GB]=Services Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos @@ -57,6 +59,7 @@ Comment=Configure file manager services 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[fi]=Tiedostonhallinnan palveluasetukset Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. @@ -79,6 +82,7 @@ X-KDE-Keywords=file manager 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[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros -- cgit v1.3.1