From 2281bd19d867c748eb717539ed17fc875be6f19f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 May 2017 05:59:44 +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 6939ca1379..86f880aa42 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -14,6 +14,7 @@ Name=Touch Screen Name[ca]=Pantalla tàctil Name[ca@valencia]=Pantalla tàctil Name[cs]=Dotyková obrazovka +Name[de]=Touchscreen Name[es]=Pantalla táctil Name[it]=Schermo a sfioramento Name[nl]=Aanraakscherm