From 67ab6d9b317221d653b9fefd20240e075cbe48a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 May 2017 05:54:25 +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 6041efdf4e..e04254deb9 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -15,6 +15,7 @@ Name[ca]=Pantalla tàctil Name[ca@valencia]=Pantalla tàctil Name[cs]=Dotyková obrazovka Name[de]=Touchscreen +Name[el]=Οθόνη αφής Name[en_GB]=Touch Screen Name[es]=Pantalla táctil Name[it]=Schermo a sfioramento