From 8ba7bc42814475fb2dde843552d3b146de144424 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Sep 2019 09:24:52 +0200 Subject: [PATCH 1/3] 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/kwinscreenedges.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 39c9121779..8f23968c2a 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -100,7 +100,7 @@ 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[ko]=활성 화면 경계와 꼭짓점 Comment[lt]=Aktyvaus ekrano kampai ir kraštinės Comment[nb]=Aktive skjemkanter og hjørner Comment[nds]=Aktive Schirmkanten un -hörns @@ -142,7 +142,7 @@ X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,sarok,szél,szegély,művelet,vá X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio,bordos de schermo de kwin,bordos de scriptorio,bordos de scriptorio,maximisa fenestras,tegula fenestras,parte de schermo, comportamento de schermo,commuta scriptorio,scriptorio virtual,angulos de schermo X-KDE-Keywords[id]=kwin,window,pengelola,efek,sudut,,tepi,bingkai,aksi,alihkan,desktop,tepian layar kwin,tepian desktop,tepian layar,maksimalkan window,ubinkan window,sisi layar,perilaku layar,alihkan desktop,virtualkan desktop,sudut layar X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi schermo kwin,bordi desktop,bordi schermo,massimizza finestre,affianca finestre,lato dello schermo,comportamento schermo,scambia desktop,desktop virtuale,angoli dello schermo -X-KDE-Keywords[ko]=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,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭지점 +X-KDE-Keywords[ko]=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,창,관리자,효과,경계,경계선,동작,액션,전환,kwin 화면 경계,화면 경계,창 최대화,최대화,바둑판식 배열,화면 행동,데스크톱 전환,가상 데스크톱,화면 모서리,꼭짓점 X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,hjørne,ramme,handling,bytte,skrivebord,kwin skjermkanter,skrivebordkanter,skjermkanter,maksimere vinduer,flislegge vinduer,skjermside,skjermoppførsel,bytte skrivebord,virtuelt skrivebord,skjermhjørner X-KDE-Keywords[nds]=KWin,Finster,Pleger,Effekt,Hörn,Kant,Rahmen,Akschoon,wesseln,Schriefdisch,maximeren,kacheln,Schirmkant,Schirmbedregen,Schirmhuuk X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,hoek,kant,rand,actie,omschakelen,bureaublad,schermranden van kwin,bureaubladkanten,schermkanten,vensters maximaliseren,venster schuin achter elkaar,zijkant van het scherm,schermgedrag,bureaublad omschakelen,virtueel bureaublad,schermhoeken From b7ea14d36323f46fdb04c5755af17aba5cc63541 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Sep 2019 09:19:57 +0200 Subject: [PATCH 2/3] 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" --- scripts/minimizeall/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index c642d3ef47..c864d4b034 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -61,6 +61,7 @@ Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien Comment[pt]=Adiciona um atalho para minimizar ou repor todas as janelas Comment[pt_BR]=Adiciona um atalho para minimizar e restaurar todas as janelas Comment[ru]=Добавляет глобальную комбинацию клавиш для сворачивания и восстановления всех окон +Comment[sk]=Pridá skratku na minimalizáciu všetkých okien alebo obnovenie všetkých okien Comment[sl]=Doda bližnjico za skrčenje ali povečanje vseh oken Comment[sr]=Додаје пречицу за минимизовање и обнављање свих прозора Comment[sr@ijekavian]=Додаје пречицу за минимизовање и обнављање свих прозора From 5d4be83de0c4866ac5e1135da15fefe003597fa6 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 15 Oct 2019 12:39:57 +0100 Subject: [PATCH 3/3] [tabbox] Correctly set global short on kwin tabbox Summary: We need to set both the current autoload shortcut and the default shortcut. setGlobalShortcut is a convenience method for both. Otherwise clicking defaults in the keys KCM will discard the shortcut forever. BUG: 407000 Test Plan: wiped kglobalshortcutsrc to get a clean slate restarted kwin alt+tab hit defauts in the kwin KCM could still alt+tab Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D24647 --- tabbox/tabbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp index 42651c6be8..475e57e31c 100644 --- a/tabbox/tabbox.cpp +++ b/tabbox/tabbox.cpp @@ -526,7 +526,7 @@ void TabBox::key(const char *actionName, Slot slot, const QKeySequence &shortcut a->setProperty("componentName", QStringLiteral(KWIN_NAME)); a->setObjectName(QString::fromUtf8(actionName)); a->setText(i18n(actionName)); - KGlobalAccel::self()->setShortcut(a, QList() << shortcut); + KGlobalAccel::self()->setGlobalShortcut(a, QList() << shortcut); input()->registerShortcut(shortcut, a, TabBox::self(), slot); auto cuts = KGlobalAccel::self()->shortcut(a); globalShortcutChanged(a, cuts.isEmpty() ? QKeySequence() : cuts.first());