From c49136a53c362c746d194446112c03c81fdc162e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Jun 2018 07:42:14 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index da7f6d55ea..f1d959635d 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -52,6 +52,7 @@ Comment=Touch screen swipe gestures Comment[ca]=Gestos de lliscament en la pantalla tàctil Comment[ca@valencia]=Gestos de lliscament en la pantalla tàctil Comment[da]=Strygegestusser til touchskærm +Comment[de]=Wischgesten für Touchscreens Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil Comment[eu]=Ukipen-pantailan irrist-keinuak