From 4d9c396a9877ff459703c6372b5426860a32400b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 May 2017 04:21:54 +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/kcmdolphinservices.desktop | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 42e0538fa..0b41019a8 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -66,6 +66,7 @@ Name[et]=Teenused Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos +Name[he]=שירותים Name[hu]=Szolgáltatások Name[ia]=Servicios Name[id]=Layanan @@ -149,6 +150,7 @@ X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros +X-KDE-Keywords[he]=מנהל קבצים X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=manajer berkas -- cgit v1.3.1