From 85ede03a57ab76e899e08992c8c0e4aa341a24aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Jun 2017 05:39:14 +0200 Subject: [PATCH 1/4] 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/fade/package/metadata.desktop | 2 +- effects/maximize/package/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop index 30bdf2511b..3158f226ca 100644 --- a/effects/fade/package/metadata.desktop +++ b/effects/fade/package/metadata.desktop @@ -50,7 +50,7 @@ Name[ne]=फेड Name[nl]=Opkomen/vervagen Name[nn]=Ton inn og ut Name[pa]=ਫਿੱਕਾ -Name[pl]=Znikanie/wyłanianie +Name[pl]=Zanikanie/wyłanianie Name[pt]=Desvanecer Name[pt_BR]=Fade Name[ro]=Decolorare diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 4768ad12ae..ea28966978 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. -Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego +Comment[pl]=Efekt skalowania okien przy maksymalizowaniu i powrocie z niego Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare From 5091feb8f60304a4a0cbb15a85f21f3d28b2e85f Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 5 Jun 2017 10:50:01 +0100 Subject: [PATCH 2/4] Fix Aurorae decorations with non integer DPI Summary: As noted by Thomas L we're casting the scaleFactor to an int far too early, which in the worst case means we end up with Aurorare themes not rendering. This moves the rounding to where it's used per border. BUG: 380524 Test Plan: Forced Xft.DPI to 95 with xrdb. Confirmed that it was broken Applied this patch. Got decoration again Reviewers: #plasma, mart Reviewed By: #plasma, mart Subscribers: mart, rikmills, plasma-devel, kwin, #kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6099 --- .../aurorae/src/lib/themeconfig.cpp | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/kdecorations/aurorae/src/lib/themeconfig.cpp b/plugins/kdecorations/aurorae/src/lib/themeconfig.cpp index cf2e28f249..357136ca3b 100644 --- a/plugins/kdecorations/aurorae/src/lib/themeconfig.cpp +++ b/plugins/kdecorations/aurorae/src/lib/themeconfig.cpp @@ -125,53 +125,53 @@ void ThemeConfig::load(const KConfig &conf) m_shadow = general.readEntry("Shadow", defaultShadow()); m_decorationPosition = general.readEntry("DecorationPosition", defaultDecorationPosition()); - int scaleFactor = 1; + qreal scaleFactor = 1; QScreen *primary = QGuiApplication::primaryScreen(); if (primary) { const qreal dpi = primary->logicalDotsPerInchX(); - scaleFactor = (qreal)dpi / (qreal)96; + scaleFactor = dpi / 96.0f; } KConfigGroup border(&conf, QStringLiteral("Layout")); // default values taken from KCommonDecoration::layoutMetric() in kcommondecoration.cpp - m_borderLeft = scaleFactor * border.readEntry("BorderLeft", defaultBorderLeft()); - m_borderRight = scaleFactor * border.readEntry("BorderRight", defaultBorderRight()); - m_borderBottom = scaleFactor * border.readEntry("BorderBottom", defaultBorderBottom()); - m_borderTop = scaleFactor * border.readEntry("BorderTop", defaultBorderTop()); + m_borderLeft = qRound(scaleFactor * border.readEntry("BorderLeft", defaultBorderLeft())); + m_borderRight = qRound(scaleFactor * border.readEntry("BorderRight", defaultBorderRight())); + m_borderBottom = qRound(scaleFactor * border.readEntry("BorderBottom", defaultBorderBottom())); + m_borderTop = qRound(scaleFactor * border.readEntry("BorderTop", defaultBorderTop())); - m_titleEdgeTop = scaleFactor * border.readEntry("TitleEdgeTop", defaultTitleEdgeTop()); - m_titleEdgeBottom = scaleFactor * border.readEntry("TitleEdgeBottom", defaultTitleEdgeBottom()); - m_titleEdgeLeft = scaleFactor * border.readEntry("TitleEdgeLeft", defaultTitleEdgeLeft()); - m_titleEdgeRight = scaleFactor * border.readEntry("TitleEdgeRight", defaultTitleEdgeRight()); - m_titleEdgeTopMaximized = scaleFactor * border.readEntry("TitleEdgeTopMaximized", defaultTitleEdgeTopMaximized()); - m_titleEdgeBottomMaximized = scaleFactor * border.readEntry("TitleEdgeBottomMaximized", defaultTitleEdgeBottomMaximized()); - m_titleEdgeLeftMaximized = scaleFactor * border.readEntry("TitleEdgeLeftMaximized", defaultTitleEdgeLeftMaximized()); - m_titleEdgeRightMaximized = scaleFactor * border.readEntry("TitleEdgeRightMaximized", defaultTitleEdgeRightMaximized()); - m_titleBorderLeft = scaleFactor * border.readEntry("TitleBorderLeft", defaultTitleBorderLeft()); - m_titleBorderRight = scaleFactor * border.readEntry("TitleBorderRight", defaultTitleBorderRight()); - m_titleHeight = scaleFactor * border.readEntry("TitleHeight", defaultTitleHeight()); + m_titleEdgeTop = qRound(scaleFactor * border.readEntry("TitleEdgeTop", defaultTitleEdgeTop())); + m_titleEdgeBottom = qRound(scaleFactor * border.readEntry("TitleEdgeBottom", defaultTitleEdgeBottom())); + m_titleEdgeLeft = qRound(scaleFactor * border.readEntry("TitleEdgeLeft", defaultTitleEdgeLeft())); + m_titleEdgeRight = qRound(scaleFactor * border.readEntry("TitleEdgeRight", defaultTitleEdgeRight())); + m_titleEdgeTopMaximized = qRound(scaleFactor * border.readEntry("TitleEdgeTopMaximized", defaultTitleEdgeTopMaximized())); + m_titleEdgeBottomMaximized = qRound(scaleFactor * border.readEntry("TitleEdgeBottomMaximized", defaultTitleEdgeBottomMaximized())); + m_titleEdgeLeftMaximized = qRound(scaleFactor * border.readEntry("TitleEdgeLeftMaximized", defaultTitleEdgeLeftMaximized())); + m_titleEdgeRightMaximized = qRound(scaleFactor * border.readEntry("TitleEdgeRightMaximized", defaultTitleEdgeRightMaximized())); + m_titleBorderLeft = qRound(scaleFactor * border.readEntry("TitleBorderLeft", defaultTitleBorderLeft())); + m_titleBorderRight = qRound(scaleFactor * border.readEntry("TitleBorderRight", defaultTitleBorderRight())); + m_titleHeight = qRound(scaleFactor * border.readEntry("TitleHeight", defaultTitleHeight())); m_buttonWidth = border.readEntry("ButtonWidth", defaultButtonWidth()); - m_buttonWidthMinimize = scaleFactor * border.readEntry("ButtonWidthMinimize", m_buttonWidth); - m_buttonWidthMaximizeRestore = scaleFactor * border.readEntry("ButtonWidthMaximizeRestore", m_buttonWidth); - m_buttonWidthClose = scaleFactor * border.readEntry("ButtonWidthClose", m_buttonWidth); - m_buttonWidthAllDesktops = scaleFactor * border.readEntry("ButtonWidthAlldesktops", m_buttonWidth); - m_buttonWidthKeepAbove = scaleFactor * border.readEntry("ButtonWidthKeepabove", m_buttonWidth); - m_buttonWidthKeepBelow = scaleFactor * border.readEntry("ButtonWidthKeepbelow", m_buttonWidth); - m_buttonWidthShade = scaleFactor * border.readEntry("ButtonWidthShade", m_buttonWidth); - m_buttonWidthHelp = scaleFactor * border.readEntry("ButtonWidthHelp", m_buttonWidth); - m_buttonWidthMenu = scaleFactor * border.readEntry("ButtonWidthMenu", m_buttonWidth); - m_buttonWidthAppMenu = scaleFactor * border.readEntry("ButtonWidthAppMenu", m_buttonWidthMenu); - m_buttonWidth *= scaleFactor; - m_buttonHeight = scaleFactor * border.readEntry("ButtonHeight", defaultButtonHeight()); - m_buttonSpacing = scaleFactor * border.readEntry("ButtonSpacing", defaultButtonSpacing()); - m_buttonMarginTop = scaleFactor * border.readEntry("ButtonMarginTop", defaultButtonMarginTop()); - m_explicitButtonSpacer = scaleFactor * border.readEntry("ExplicitButtonSpacer", defaultExplicitButtonSpacer()); + m_buttonWidthMinimize = qRound(scaleFactor * border.readEntry("ButtonWidthMinimize", m_buttonWidth)); + m_buttonWidthMaximizeRestore = qRound(scaleFactor * border.readEntry("ButtonWidthMaximizeRestore", m_buttonWidth)); + m_buttonWidthClose = qRound(scaleFactor * border.readEntry("ButtonWidthClose", m_buttonWidth)); + m_buttonWidthAllDesktops = qRound(scaleFactor * border.readEntry("ButtonWidthAlldesktops", m_buttonWidth)); + m_buttonWidthKeepAbove = qRound(scaleFactor * border.readEntry("ButtonWidthKeepabove", m_buttonWidth)); + m_buttonWidthKeepBelow = qRound(scaleFactor * border.readEntry("ButtonWidthKeepbelow", m_buttonWidth)); + m_buttonWidthShade = qRound(scaleFactor * border.readEntry("ButtonWidthShade", m_buttonWidth)); + m_buttonWidthHelp = qRound(scaleFactor * border.readEntry("ButtonWidthHelp", m_buttonWidth)); + m_buttonWidthMenu = qRound(scaleFactor * border.readEntry("ButtonWidthMenu", m_buttonWidth)); + m_buttonWidthAppMenu = qRound(scaleFactor * border.readEntry("ButtonWidthAppMenu", m_buttonWidthMenu)); + m_buttonWidth = qRound(m_buttonWidth * scaleFactor); + m_buttonHeight = qRound(scaleFactor * border.readEntry("ButtonHeight", defaultButtonHeight())); + m_buttonSpacing = qRound(scaleFactor * border.readEntry("ButtonSpacing", defaultButtonSpacing())); + m_buttonMarginTop = qRound(scaleFactor * border.readEntry("ButtonMarginTop", defaultButtonMarginTop())); + m_explicitButtonSpacer = qRound(scaleFactor * border.readEntry("ExplicitButtonSpacer", defaultExplicitButtonSpacer())); - m_paddingLeft = scaleFactor * border.readEntry("PaddingLeft", defaultPaddingLeft()); - m_paddingRight = scaleFactor * border.readEntry("PaddingRight", defaultPaddingRight()); - m_paddingTop = scaleFactor * border.readEntry("PaddingTop", defaultPaddingTop()); - m_paddingBottom = scaleFactor * border.readEntry("PaddingBottom", defaultPaddingBottom()); + m_paddingLeft = qRound(scaleFactor * border.readEntry("PaddingLeft", defaultPaddingLeft())); + m_paddingRight = qRound(scaleFactor * border.readEntry("PaddingRight", defaultPaddingRight())); + m_paddingTop = qRound(scaleFactor * border.readEntry("PaddingTop", defaultPaddingTop())); + m_paddingBottom = qRound(scaleFactor * border.readEntry("PaddingBottom", defaultPaddingBottom())); } QColor ThemeConfig::activeTextColor(bool useTabs, bool focused) const From 6d9a7142e5b7705ae5abccd951e29e6b7f4b0f30 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 6 Jun 2017 11:42:40 +0100 Subject: [PATCH 3/4] Update version number for 5.10.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b7afe1ef..3040b552ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.10.0") +set(PROJECT_VERSION "5.10.1") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 1112188a8b9d9afa8fc17c0c4ee37bc9d7c2a56a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 10 Jun 2017 05:41:19 +0200 Subject: [PATCH 4/4] 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/frozenapp/package/metadata.desktop | 2 ++ effects/logout/package/metadata.desktop | 1 + kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 3 +++ packageplugins/aurorae/kwin-packagestructure-aurorae.desktop | 1 + .../decoration/kwin-packagestructure-decoration.desktop | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 2 +- plugins/kdecorations/aurorae/src/kwindecoration.desktop | 2 +- scripts/enforcedeco/metadata.desktop | 2 +- 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index e111f7b8d0..8a7acbe1b1 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Dessatura les aplicacions que no responen Name[ca@valencia]=Dessatura les aplicacions que no responen Name[en_GB]=Desaturate Unresponsive Applications Name[es]=Desaturar las aplicaciones que no responden +Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa Name[he]=מחשיך יישומים שאינם מגיבים Name[it]=Desatura le applicazioni che non rispondono Name[nl]=Verzadiging van niet responsieve toepassingen verminderen @@ -27,6 +28,7 @@ Comment[ca]=Dessatura les finestres de les aplicacions que no responen (congelad Comment[ca@valencia]=Dessatura les finestres de les aplicacions que no responen (congelades) Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas) +Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate) Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index fb2855d53d..3573a057b5 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -7,6 +7,7 @@ Name[de]=Abmeldung Name[el]=αποσύνδεση Name[en_GB]=logout Name[es]=cerrar la sesión +Name[fi]=kirjaudu ulos Name[he]=התנתקות Name[hu]=Kijelentkezés Name[ia]=Clausura de session diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index d647fc2fe9..3259f1a3fe 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -25,7 +25,7 @@ Name[en_GB]=Window Decorations Name[es]=Decoración de ventanas Name[et]=Akna dekoratsioonid Name[eu]=Leiho-apaindurak -Name[fi]=Ikkunoiden kehykset +Name[fi]=Ikkunakehykset Name[fr]=Décorations de fenêtres Name[ga]=Maisiúcháin Fhuinneog Name[gl]=Decoración da xanela diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 701a658d6d..c98292268d 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -18,6 +18,7 @@ Name[de]=Touchscreen Name[el]=Οθόνη αφής Name[en_GB]=Touch Screen Name[es]=Pantalla táctil +Name[fi]=Kosketusnäyttö Name[he]=מסך מגע Name[it]=Schermo a sfioramento Name[nl]=Aanraakscherm @@ -40,6 +41,7 @@ Comment[ca]=Gestos de lliscament en la pantalla tàctil Comment[ca@valencia]=Gestos de lliscament en la pantalla tàctil Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil +Comment[fi]=Kosketusnäytön pyyhkäisyeleet Comment[he]=מחוות החלקה של מסכי מגע Comment[it]=Gesti dello schermo a sfioramento Comment[nl]=Veeggebaren voor aanraakscherm @@ -63,6 +65,7 @@ X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,vora,borde,acció,canvi,escriptor X-KDE-Keywords[ca@valencia]=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 X-KDE-Keywords[en_GB]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behaviour,touch screen X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes del escritorio,bordes de la pantalla,lado de la pantalla,comportamiento de la pantalla,pantalla táctil +X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,tehoste,kulma,laita,reuna,toiminto,vaihda,työpöytä,työpöydän reunat,näytön reunat,näytön laita,näytön käyttäytyminen,kosketusnäyttö X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi desktop,bordi schermo,lato dello schermo,comportamento schermo,schermo a sfioramento X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,kant,rand,actie,omschakelen,bureaublad,bureaubladkanten,schermkanten,zijkant van het scherm,schermgedrag,aanraakscherm X-KDE-Keywords[pl]=kwin,okno,menadżer,efekt,krawędź,obramowanie,działanie,przełącz,pulpit,krawędzie pulpitu,krawędzie ekranu,strona ekranu,zachowanie ekranu,ekran dotykowy diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 2a4853b283..aa85a4529e 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -7,6 +7,7 @@ Name[de]=KWin Aurorae Name[el]=KWin Aurorae Name[en_GB]=KWin Aurorae Name[es]=Aurorae de KWin +Name[fi]=KWin Aurorae Name[hu]=KWin Aurorae Name[it]=Aurorae di Kwin Name[nl]=KWin Aurorae diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 166ec5113a..5b859b47e9 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -7,6 +7,7 @@ Name[de]=KWin-Dekoration Name[el]=Διακοσμήσεις KWin Name[en_GB]=KWin Decoration Name[es]=Decoración de KWin +Name[fi]=KWin-ikkunakehykset Name[hu]=KWin dekoráció Name[ia]=Decorationes de KWin Name[it]=Decorazioni di KWin diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 8e5fa485d2..3416844b69 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -8,7 +8,7 @@ Name[de]=Aurorae-Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Aurorae Name[en_GB]=Aurorae Window Decorations Name[es]=Decoración de ventanas Aurorae -Name[fi]=Aurorae-ikkunakoristeet +Name[fi]=Aurorae-ikkunakehykset Name[fr]=Décorations de fenêtres Aurorae Name[hu]=Aurorae ablakdekorációk Name[ia]=Decorationes de fenestra Aurorae diff --git a/plugins/kdecorations/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop index f3f29e3ce2..8fcf780b55 100644 --- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop +++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop @@ -15,7 +15,7 @@ Comment[en_GB]=KWin Window Decoration Comment[es]=Decoración de ventanas de KWin Comment[et]=KWini akna dekoratsioon Comment[eu]=KWin leihoen apainketa -Comment[fi]=KWin-ikkunan kehys +Comment[fi]=KWin-ikkunakehys Comment[fr]=Décorations de fenêtres KWin Comment[ga]=Maisiúchán Fuinneog KWin Comment[gl]=Decoración de xanela de Kwin diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index 50bc6e657c..ed61f015b5 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -11,7 +11,7 @@ Name[en_GB]=Enforces Window Decorations on GTK+ window Name[es]=Fuerza decoraciones en las ventanas de GTK+ Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu -Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille +Name[fi]=Pakottaa GTK+-ikkunoiden ikkunakehykset Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+ Name[gl]=Aplica a decoración ás xanelas de GTK+ Name[he]=אכוף עיצוב מסגרת חלון לחלונות GTK