From 143ac41e0b0a32fa91400a6a3d8d6d4f70e6eeb1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Aug 2019 04:54:41 +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"
---
 .../kwinscreenedges/kwinscreenedges.desktop   | 41 -------------------
 .../kwinscreenedges/kwintouchscreen.desktop   | 34 ---------------
 2 files changed, 75 deletions(-)

diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index dffcbc3ab0..982de2bf67 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -81,47 +81,6 @@ Name[zh_CN]=屏幕边缘
 Name[zh_TW]=螢幕邊緣
 
 Comment=Configure active screen corners and edges
-Comment[bs]=Ivice i uglovi aktivnog ekrana
-Comment[ca]=Cantonades i vores actives de la pantalla
-Comment[ca@valencia]=Cantons i vores actives de la pantalla
-Comment[cs]=Aktivní rohy a hrany obrazovky
-Comment[da]=Aktive skærmhjørner og -kanter
-Comment[de]=Aktive Bildschirmränder
-Comment[el]=Ενεργές γωνίες και άκρα οθόνης
-Comment[en_GB]=Active Screen Corners and Edges
-Comment[es]=Esquinas y bordes de la pantalla activa
-Comment[et]=Aktiivsed ekraani nurgad ja servad
-Comment[eu]=Pantaila aktiboaren izkinak eta ertzak
-Comment[fi]=Näytön kulmien ja reunojen toiminnot
-Comment[fr]=Bords et coins actifs de l'écran
-Comment[gl]=Bordos e esquinas activos da pantalla
-Comment[he]=פינות וקצוות של המסך
-Comment[hu]=Aktív képernyősarkok és szélek
-Comment[id]=Tepian dan Sudut Layar Aktif
-Comment[it]=Angoli e bordi attivi dello schermo
-Comment[ko]=활성 화면 경계와 꼭지점
-Comment[lt]=Aktyvaus ekrano kampai ir kraštinės
-Comment[nb]=Aktive skjemkanter og hjørner
-Comment[nds]=Aktive Schirmkanten un -hörns
-Comment[nl]=Hoeken en randen van het actieve scherm
-Comment[nn]=Aktive skjermhjørne og skjermkantar
-Comment[pa]=ਸਰਗਰਮ ਸਕਰੀਨ ਕੋਨੇ ਅਤੇ ਬਾਹੀਆਂ
-Comment[pl]=Narożniki i krawędzie aktywnego ekranu
-Comment[pt]=Cantos e Extremos do Ecrã Activo
-Comment[pt_BR]=Cantos e bordas da tela ativa
-Comment[ru]=Настройка действий для краёв экрана
-Comment[sk]=Rohy a okraje aktívneho okna
-Comment[sl]=Dejavni robovi in koti zaslona
-Comment[sr]=Активни углови и ивице екрана
-Comment[sr@ijekavian]=Активни углови и ивице екрана
-Comment[sr@ijekavianlatin]=Aktivni uglovi i ivice ekrana
-Comment[sr@latin]=Aktivni uglovi i ivice ekrana
-Comment[sv]=Aktiva skärmhörn och kanter
-Comment[tr]=Etkin Ekran Kenar ve Köşeleri
-Comment[uk]=Активні кути та краї екрана
-Comment[x-test]=xxActive Screen Corners and Edgesxx
-Comment[zh_CN]=活动屏幕边缘
-Comment[zh_TW]=作用中螢幕角落與邊緣
 
 X-KDE-Keywords=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners
 X-KDE-Keywords[bs]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners, prozor, menadćer, efekt, uigao, ivica, akcija, prebacivanje, desktop ivice, ivice ekrana, maksimitiranje prozora, ponašanje ekrana, virtualni desktop
diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
index ab13151486..9d4bbf14f3 100644
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@@ -49,40 +49,6 @@ Name[x-test]=xxTouch Screenxx
 Name[zh_CN]=触摸屏
 Name[zh_TW]=觸控螢幕
 Comment=Configure 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
-Comment[fi]=Kosketusnäytön pyyhkäisyeleet
-Comment[fr]=Mouvements sur l'écran tactile
-Comment[gl]=Xestos de pantalla táctil
-Comment[he]=מחוות החלקה של מסכי מגע
-Comment[hu]=Érintőképernyő-gesztusok
-Comment[id]=Gestur usap layar sentuh
-Comment[it]=Gesti dello schermo a sfioramento
-Comment[ko]=터치 스크린 밀기 제스처
-Comment[nl]=Veeggebaren voor aanraakscherm
-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 touchscreen
-Comment[ru]=Действия при проведении по сенсорному экрану
-Comment[sk]=Ťahacie gestá dotykovej obrazovky
-Comment[sl]=Kretnje vlečenja za zaslon na dotik
-Comment[sr]=Гестови замаха на додирнику
-Comment[sr@ijekavian]=Гестови замаха на додирнику
-Comment[sr@ijekavianlatin]=Gestovi zamaha na dodirniku
-Comment[sr@latin]=Gestovi zamaha na dodirniku
-Comment[sv]=Draggester för pekskärm
-Comment[tr]=Dokunmatik ekran kaydırma hareketleri
-Comment[uk]=Жести на сенсорній панелі
-Comment[x-test]=xxTouch screen swipe gesturesxx
-Comment[zh_CN]=触摸屏滑动手势
-Comment[zh_TW]=觸控螢幕滑動手勢
 
 X-KDE-Keywords=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen
 X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,vora,borde,acció,canvi,escriptori,vores d'escriptori,vores de pantalla,costat de pantalla,comportament de la pantalla,pantalla tàctil