From 5d99392d1e5c15ba341116d374bc8dfcce79f62d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Dec 2021 01:42:01 +0000 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" --- src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index ac35a3aeb3..86c2431737 100644 --- a/src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior X-KDE-Weight=50 Name=Touch Screen +Name[ar]=شاشة اللمس Name[ast]=Pantalla táctil Name[az]=Toxunma ekranı Name[ca]=Pantalla tàctil