From b5b4cff18c55e7c598b770668a61c0860c866cfd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Feb 2019 09:22:45 +0100 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 07643677e1..f74d57f092 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -69,7 +69,7 @@ Comment[nn]=Fingerrørsler på trykkskjerm Comment[pa]=ਟੱਚ ਸਕਰੀਨ ਸਕਰਾਉਣ ਜੈਸਚਰ Comment[pl]=Gesty na ekranie dotykowym Comment[pt]=Gestos para deslizar o ecrã táctil -Comment[pt_BR]=Gestos no touch screen +Comment[pt_BR]=Gestos no touchscreen Comment[ru]=Действия при проведении по сенсорному экрану Comment[sk]=Ťahacie gestá dotykovej obrazovky Comment[sl]=Kretnje vlečenja za zaslon na dotik