From a143a83f6732e1bd73a70221e18a9ce3c3788912 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 4 Sep 2018 08:26:22 +0200 Subject: [PATCH 1/5] 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" --- effects/cube/cube_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/cube/cube_config.desktop b/effects/cube/cube_config.desktop index 47ebd0f0d6..0be142b5ab 100644 --- a/effects/cube/cube_config.desktop +++ b/effects/cube/cube_config.desktop @@ -60,7 +60,7 @@ Name[pl]=Sześcian pulpitu Name[pt]=Cubo de Ecrãs Name[pt_BR]=Cubo de áreas de trabalho Name[ro]=Cub de birou -Name[ru]=Куб с рабочими столами +Name[ru]=Куб рабочих столов Name[si]=වැඩතල ඝනකය Name[sk]=Plochy na kocke Name[sl]=Kocka z namizji From a839dadf9b29ffec357d7e1d0e3d1568071d5874 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 8 Sep 2018 08:44:29 +0200 Subject: [PATCH 2/5] 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/kwinoptions/kwinadvanced.desktop | 2 +- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.desktop | 2 +- kwin.notifyrc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index f4d627d14e..d2e868ed94 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -116,7 +116,7 @@ Comment[gl]=Funcionalidades avanzadas da xestión de xanelas Comment[he]=תכונות ניהול חלונות מתקדמים Comment[hu]=Speciális ablakkezelési szolgáltatások Comment[ia]=Characteristicas avantiate de gestion de fenestra -Comment[id]=Fitur Pengelolaan Jendela Lanjutan +Comment[id]=Fitur Pengelolaan Jendela Tingkatlanjut Comment[it]=Funzionalità avanzate della gestione delle finestre Comment[ja]=高度なウインドウ管理機能 Comment[ko]=고급 창 관리자 기능 설정 diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index a710d57ee8..25f0cc6904 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -61,7 +61,7 @@ Comment[fr]=Mouvements sur l'écran tactile Comment[gl]=Xestos de pantalla táctil Comment[he]=מחוות החלקה של מסכי מגע Comment[hu]=Érintőképernyő-gesztusok -Comment[id]=Isyarat usap layar sentuh +Comment[id]=Isyarat usapan layar sentuh Comment[it]=Gesti dello schermo a sfioramento Comment[ko]=터치 스크린 밀기 제스처 Comment[nl]=Veeggebaren voor aanraakscherm diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index 8bcbea9eeb..7d975c1e58 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -129,7 +129,7 @@ Comment[gl]=Xestiona os scripts de KWin Comment[he]=נהל תוספים של KWin Comment[hu]=KWin szkriptek kezelése Comment[ia]=Gere scriptos de KWin -Comment[id]=Atur skrip KWin +Comment[id]=Kelola skrip KWin Comment[it]=Gestione script kwin Comment[kk]=KWin скрипттерін басқару Comment[km]=គ្រប់គ្រង​ស្គ្រីប KWin diff --git a/kwin.notifyrc b/kwin.notifyrc index e9595c61a1..05cfbff8e9 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -152,7 +152,7 @@ Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. Comment[ia]=Altere application ha requirite de suspender le composition. -Comment[id]=Aplikasi lain telah meminta untuk suspensi komposit. +Comment[id]=Aplikasi lain telah meminta untuk mensuspensi komposit. Comment[is]=Annað forrit hefur beðið um að skjásamsetningu verði hætt. Comment[it]=Un'altra applicazione ha richiesto di sospendere la composizione. Comment[ja]=他のアプリケーションがコンポジティングの一時停止を要求しました。 From 838bd060c61888d9311eb64992c88d12ada9bc16 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 25 Sep 2018 10:29:06 +0100 Subject: [PATCH 3/5] Update version number for 5.12.7 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bef461dc0..be4c0787b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.12.6") +set(PROJECT_VERSION "5.12.7") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0") From 4b24a538fcc19dfe20d077f6df1bb9efddbf7634 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Sep 2018 08:55:05 +0200 Subject: [PATCH 4/5] 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" --- effects/translucency/package/metadata.desktop | 4 ++-- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/effects/translucency/package/metadata.desktop b/effects/translucency/package/metadata.desktop index c20654a71b..f852ad1369 100644 --- a/effects/translucency/package/metadata.desktop +++ b/effects/translucency/package/metadata.desktop @@ -34,7 +34,7 @@ Name[hu]=Áttetszőség Name[ia]=Translucentia Name[id]=Translucency Name[is]=Hálfgegnsæi -Name[it]=Traslucenza +Name[it]=Translucenza Name[ja]=半透明 Name[ka]=ნახევრადგამჭირვალეობა Name[kk]=Мөлдірлік @@ -112,7 +112,7 @@ Comment[hu]=Áttetszővé tesz ablakokat bizonyos feltételek teljesülése eset Comment[ia]=On face fenestra translucente sub conditiones differente Comment[id]=Buat jendela translusens di bawah kondisi berbeda Comment[is]=Gerir glugga hálfgegnsæa við ýmis tilefni -Comment[it]=Rende le finestre traslucide in certe condizioni +Comment[it]=Rende le finestre translucide in certe condizioni Comment[ja]=さまざまな状況でウィンドウを半透明にします Comment[kk]=Түрлі жағдайда терезелерді мөлдір қылады Comment[km]=ធ្វើ​ឲ្យ​បង្អួច​ថ្លា​ក្រោមលក្ខខណ្ឌ​ផ្សេងៗ​គ្នា diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index d2e868ed94..514ca02844 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -160,7 +160,7 @@ X-KDE-Keywords[gl]=sombra,bordo,beira,pasar,bordos activos,beiras activas,lapela X-KDE-Keywords[hu]=árnyékolás,szegély,lebegés,aktív szegélyek,csempézés,bejárás,ablakbejárás,ablakcsoportosítás,ablakcsempézés,ablakelhelyezés,ablakok elhelyezése,ablak speciális viselkedése X-KDE-Keywords[ia]=umbrar,margine,planante,margines active,con tegulas,schedas,tabbing,tabbing de fenestra,gruppante fenestra,fenestra con tegulas,placiamento de fenestra,placiamento de fenestras, comportamento avantiate de fenestra X-KDE-Keywords[id]=bayangan,batas,melayang,batas aktif,ubin,tab,tab,tab jendela,grup jendela,ubin jendela,penempatan jendela,penempatan jendela,perilaku lanjutan jendela -X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancatura,schede,navigazione schede,finestre a schede,regruppamento finestre,affaincatura finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre +X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione schede,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre X-KDE-Keywords[kk]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior X-KDE-Keywords[km]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior X-KDE-Keywords[ko]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior,그림자,경계선,호버,지나다니기,타일,탭,창 탭,창 그룹,창 타일,창 위치 From 980e390743c153966dd364f4a0ebaadd8d1b03a5 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 12 Oct 2018 13:51:25 +0200 Subject: [PATCH 5/5] [kcmkwin/ruleswidget] Disable "Detect" button when countdown is running Avoids triggering an assert and communicates that the timeout is running. Ideally, there was a countdown label of some sort but this is better than crashing. BUG: 399644 FIXED-IN: 5.12.8 Differential Revision: https://phabricator.kde.org/D16124 --- kcmkwin/kwinrules/ruleswidget.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp index c10d66b4b1..1116b9dcb8 100644 --- a/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kcmkwin/kwinrules/ruleswidget.cpp @@ -683,6 +683,7 @@ void RulesWidget::detectClicked() detect_dlg = new DetectDialog; connect(detect_dlg, SIGNAL(detectionDone(bool)), this, SLOT(detected(bool))); detect_dlg->detect(0, Ui::RulesWidgetBase::detection_delay->value()); + Ui::RulesWidgetBase::detect->setEnabled(false); } void RulesWidget::detected(bool ok) @@ -722,6 +723,7 @@ void RulesWidget::detected(bool ok) delete detect_dlg; detect_dlg = nullptr; detect_dlg_ok = ok; + Ui::RulesWidgetBase::detect->setEnabled(true); } #define GENERIC_PREFILL( var, func, info, uimethod ) \