From 3024a7358b6abc30aa87aab669aab1eb2d65e3ce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 05:54:38 +0200 Subject: [PATCH] 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" --- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 15c28df3ea..c04d625f39 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -61,7 +61,7 @@ Comment[fr]=Mouvements sur l'écran tactile Comment[gl]=Xestos de pantalla táctil Comment[he]=מחוות החלקה של מסכי מגע Comment[hu]=Érintőképernyő-gesztusok -Comment[id]=Isyarat usapan layar sentuh +Comment[id]=Gestur usap layar sentuh Comment[it]=Gesti dello schermo a sfioramento Comment[ko]=터치 스크린 밀기 제스처 Comment[nl]=Veeggebaren voor aanraakscherm