From af1e13f9fa86c6a7f9bf397269559eda38e7aec6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Nov 2020 06:20:03 +0100 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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 5d96779a1..05572e18e 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -15,6 +15,7 @@ Name[eu]=Dolphin zerbitzuak Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin +Name[he]=שרותי Dolphin Name[hu]=Dolphin szolgáltatások Name[ia]=Servicios de Dolphin Name[id]=Layanan Dolphin -- cgit v1.3.1