From 867552fce4209f9924282954df368ee2e743f9fb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Dec 2019 09:21:14 +0100 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/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 2 ++ kcmkwin/kwinoptions/kwinadvanced.desktop | 2 ++ kcmkwin/kwinoptions/kwinfocus.desktop | 3 +++ kcmkwin/kwinoptions/kwinmoving.desktop | 2 ++ kcmkwin/kwinoptions/kwinoptions.desktop | 1 + 6 files changed, 11 insertions(+) diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index c3497b574d..56d757bc18 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -69,6 +69,7 @@ Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[eu]=Konfiguratu konposatzailearen ezarpenak mahaigaineko efektuetarako Comment[fi]=Koostimen asetukset työpöytätehosteille +Comment[fr]=Configurer les paramètres du compositeur pour les effets de bureau Comment[gl]=Configurar o compositor para os efectos de escritorio Comment[id]=Konfigurasikan pengaturan kompositor untuk efek desktop Comment[it]=Configura impostazioni del compositore per gli effetti del desktop diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 0fd1ec87dc..0951aaf5df 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -17,6 +17,7 @@ Name[en_GB]=Window Actions Name[es]=Acciones de ventanas Name[eu]=Leihoetako ekintzak Name[fi]=Ikkunan toiminnot +Name[fr]=Actions de la fenêtre Name[gl]=Accións da xanela Name[id]=Aksi Window Name[it]=Azioni delle finestre @@ -42,6 +43,7 @@ Comment[en_GB]=Configure mouse actions for windows and titlebars Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de títulos Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin Comment[fi]=Ikkunoiden ja otsikkopalkkien hiiritoimintojen asetukset +Comment[fr]=Configurer les actions de la souris pour les fenêtres et barres de titres Comment[gl]=Configurar as accións do rato para xanelas e barras de título Comment[id]=Konfigurasikan aksi mouse untuk window dan bilah-judul Comment[it]=Configura azioni del mouse per finestre e barre del titolo diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 041c9b244a..102103d2cc 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -16,6 +16,7 @@ Name[en_GB]=Advanced Window Behaviour Name[es]=Comportamiento avanzado de las ventanas Name[eu]=Leihoaren portaera aurreratua Name[fi]=Ikkunatoiminnan lisäasetukset +Name[fr]=Comportement avancé des fenêtres Name[gl]=Comportamento avanzado das xanelas Name[id]=Perilaku Window Tingkat-Lanjut Name[it]=Comportamento avanzato delle finestre @@ -41,6 +42,7 @@ Comment[en_GB]=Configure advanced window management options Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak Comment[fi]=Ikkunanhallinnan lisäasetukset +Comment[fr]=Configuré les options de gestion avancée des fenêtres Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas Comment[id]=Konfigurasikan opsi pengelolaan window tingkat-lanjut Comment[it]=Configura opzioni avanzate della gestione delle finestre diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index a26182a9d9..fde1e482e5 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -15,6 +15,7 @@ Name[en_GB]=Window Focus Behaviour Name[es]=Comportamiento del foco de las ventanas Name[eu]=Leiho fokuaren portaera Name[fi]=Ikkunoiden kohdistuskäytäntö +Name[fr]=Comportement de focus des fenêtres Name[gl]=Comportamento do foco das xanelas Name[id]=Perilaku Fokus Window Name[it]=Comportamento del fuoco delle finestre @@ -39,6 +40,7 @@ Comment[en_GB]=Configure window activation policy Comment[es]=Configurar la política de activación de ventanas Comment[eu]=Konfiguratu leihoa aktibatzeko gidalerroak Comment[fi]=Ikkunoiden aktivointikäytännön asetukset +Comment[fr]=Configurer la politique d'activation des fenêtres Comment[gl]=Configurar a política de activación de xanelas Comment[id]=Konfigurasikan kebijakan pengaktifan window Comment[it]=Configura criteri di attivazione delle finestre @@ -62,6 +64,7 @@ X-KDE-Keywords[en_GB]=focus,auto raise,raise,click raise,keyboard,CDE,alt-tab,al X-KDE-Keywords[es]=foco,auto levantar,levantar,clic para levantar,teclado,CDE,alt-tab,todo el escritorio,el foco sigue al ratón,prevención de foco,robo del foco,política del foco,comportamiento del foco de las ventanas,comportamiento de la pantalla de ventanas X-KDE-Keywords[eu]=fokua,automatikoki igo,igo,egin klik igotzeko,teklatu,CDE,alt-tab,mahaigain guztiak,fokuak saguari jarraitzen dio,foku-prebentzioa,foku-lapurreta,fokuaren gidalerro,leihoen fokuaren portaera,leihoen pantailen portaera X-KDE-Keywords[fi]=kohdistus,sijoitus,automaattinen nosto,automaattinen nostaminen,nosta,nosta napsauttamalla,näppäimistö,alt-sarkain,kaikki työpöydät,kohdistus seuraa hiirtä,kohdistuksen esto,kohdistuksen varastaminen,kohdistustapa,ikkunoiden kohdistuksen toiminta,ikkunoiden näyttötoiminta +X-KDE-Keywords[fr]=focus, agrandissement automatique, agrandissement, clic d'agrandissement, clavier, CDE, alt-tab, tous les bureaux, focus suivi par la souris, prise de focus, politique de focus, comportement du focus des fenêtres, comportement des fenêtres X-KDE-Keywords[gl]=foco,erguer automaticamente,erguer,erguer ao premer,teclado,CDE,alt-tab,todo o escritorio,foco que segue o rato,prevención do foco,roubar o foco,política de foco,comportamento de foco de xanela,comportamento de pantalla de xanela X-KDE-Keywords[id]=fokus,auto naik,naikkan,klik naikkan,keyboard,papan ketik,CDE,alt-tab,semua desktop,fokus mengikuti mouse,pencegahan fokus,pencurian fokus,kebijakan fokus,perilaku fokus window,perilaku layar window X-KDE-Keywords[it]=fuoco,avanzamento automatico,avanzamento,avanzamento con clic,tastiera,CDE,alt-tab,tutti i desktop,il fuoco segue il mouse,impedisci il fuoco,mantieni il fuoco,regole fuoco,comportamento fuoco finestra, comportamento schermo finestra diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 22367aa481..82009cd500 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -16,6 +16,7 @@ Name[en_GB]=Window Movement Name[es]=Movimiento de las ventanas Name[eu]=Leihoaren mugimendua Name[fi]=Ikkunoiden siirtäminen +Name[fr]=Déplacement des fenêtres Name[gl]=Movemento das xanelas Name[id]=Pemindahan Window Name[it]=Spostamento delle finestre @@ -40,6 +41,7 @@ Comment[en_GB]=Configure window movement options Comment[es]=Configurar las opciones del movimiento de las ventanas Comment[eu]=Konfiguratu leiho mugimenduaren aukerak Comment[fi]=Ikkunoiden siirtämisen asetukset +Comment[fr]=Configurer les options de déplacement des fenêtres Comment[gl]=Configurar o movemento das xanelas Comment[id]=Konfigurasikan opsi pemindahan window Comment[it]=Configura opzioni di spostamento delle finestre diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 268c0aa2c1..2b80fbd578 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -107,6 +107,7 @@ Comment[en_GB]=Configure window actions and behaviour Comment[es]=Configurar las acciones y el comportamiento de las ventanas Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea Comment[fi]=Ikkunatoimintojen asetukset +Comment[fr]=Configurer les actions et le comportement des fenêtres Comment[gl]=Configurar o comportamento e as accións das xanelas Comment[id]=Konfigurasikan perilaku dan aksi window Comment[it]=Configura azioni e comportamento delle finestre From 92817c5ac6d43cc9cedcc24e0f119608af3da947 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Dec 2019 09:23:30 +0100 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" --- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 102103d2cc..180933e18e 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -42,7 +42,7 @@ Comment[en_GB]=Configure advanced window management options Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak Comment[fi]=Ikkunanhallinnan lisäasetukset -Comment[fr]=Configuré les options de gestion avancée des fenêtres +Comment[fr]=Configurer les options de gestion avancée des fenêtres Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas Comment[id]=Konfigurasikan opsi pengelolaan window tingkat-lanjut Comment[it]=Configura opzioni avanzate della gestione delle finestre From 5646c781c88ab0f0427f23102bea889a835bd378 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 7 Jan 2020 15:16:05 +0200 Subject: [PATCH 3/3] [nightcolor] Fix division by zero Summary: If qAbs(targetTemp - m_currentTemp) is less than TEMPERATURE_STEP, then it will result in a division by zero. FIXED-IN: 5.17.5 BUG: 415359 Reviewers: #kwin, apol Reviewed By: apol Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D26493 --- colorcorrection/manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colorcorrection/manager.cpp b/colorcorrection/manager.cpp index 50b304ca0e..79e9a1428c 100644 --- a/colorcorrection/manager.cpp +++ b/colorcorrection/manager.cpp @@ -408,7 +408,7 @@ void Manager::resetSlowUpdateTimer() } // calculate interval such as temperature is changed by TEMPERATURE_STEP K per timer timeout - int interval = availTime / (qAbs(targetTemp - m_currentTemp) / TEMPERATURE_STEP); + int interval = availTime * TEMPERATURE_STEP / qAbs(targetTemp - m_currentTemp); if (interval == 0) { interval = 1; }