From 2b6ddf6daa2d5a6b0dab61e492f4fff9dcd07b79 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 1 May 2018 13:29:09 +0100 Subject: [PATCH 1/3] Update version number for 5.12.5 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0f9a210f..4ea7ad713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(plasma-workspace) -set(PROJECT_VERSION "5.12.4") +set(PROJECT_VERSION "5.12.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 681e2145484431ede79fed978c1318e8d3ad3eff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 May 2018 07:41:17 +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" --- lookandfeel/metadata.desktop | 2 +- themes/qtmacintosh.themerc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 73285ce75..af7a9f333 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -55,7 +55,7 @@ Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shut Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation; Keywords[gl]=Escritorio;Espazo de traballo;Aparencia;Aparencia e Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar; Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás; -Keywords[id]=Desktop;Ruang Kerja;Tampilan;Tampilan dan Rasa;Keluar;Kancing;Suspensi;Matikan;Hibernasi; +Keywords[id]=Desktop;Ruang Kerja;Penampilan;Penampilan dan Rasa;Keluar;Kancing;Suspensi;Matikan;Hibernasi; Keywords[is]=skjáborð;vinnusvæði;útlit;ásýnd og hegðun;Útskráning;Læsing;setja í bið;slökkva;svæfa; Keywords[it]=desktop;spazio di lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione; Keywords[ja]=デスクトップ;ワークスペース;外観;外観と挙動;ログアウト;ロック;サスペンド;シャットダウン;休止状態; diff --git a/themes/qtmacintosh.themerc b/themes/qtmacintosh.themerc index e600d215d..d93012057 100644 --- a/themes/qtmacintosh.themerc +++ b/themes/qtmacintosh.themerc @@ -95,7 +95,7 @@ Comment[he]=סגנון המשתמש במנהל המראה של Apple Comment[hr]=Stil koji koristi Appleov upravitelj izgleda Comment[hu]=Az Apple Megjelenítéskezelőt használó stílus Comment[ia]=Stilo que usa le gerente de apparentia Apple -Comment[id]=Gaya yang menggunakan Pengelola Tampilan Apple +Comment[id]=Gaya yang menggunakan Pengelola Penampilan Apple Comment[is]=Stíll sem notar Apple Appearance Manager Comment[it]=Stile che usa il gestore dell'aspetto di Apple Comment[ja]=Apple のアピアランスマネージャを使うスタイル From b998e68d1128a246d6d9371909ead63cc95dbfd6 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 16 May 2018 13:39:12 +0200 Subject: [PATCH 3/3] [Service Runner] Do startsWith check case-insensitive This codepath is hit when the search query is very short. Fixes "D" and "d" finding different, sometimes no, results. BUG: 394202 FIXED-IN: 5.12.6 Differential Revision: https://phabricator.kde.org/D12927 --- runners/services/servicerunner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/services/servicerunner.cpp b/runners/services/servicerunner.cpp index 4def27023..3f99dee85 100644 --- a/runners/services/servicerunner.cpp +++ b/runners/services/servicerunner.cpp @@ -248,7 +248,7 @@ private: // If the term was < 3 chars and NOT at the beginning of the App's name or Exec, then // chances are the user doesn't want that app. if (weightedTermLength < 3) { - if (name.startsWith(term) || exec.startsWith(term)) { + if (name.startsWith(term, Qt::CaseInsensitive) || exec.startsWith(term, Qt::CaseInsensitive)) { relevance = 0.9; } else { continue;