From dcf597a767b2f32485ba3ab748775462c2e8e6ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Oct 2018 08:30:40 +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" --- applets/lock_logout/metadata.desktop | 6 +++--- klipper/klipperrc.desktop | 2 +- lookandfeel/metadata.desktop | 2 +- .../plasma-packagestructure-wallpaperimages.desktop | 2 +- wallpapers/image/imagepackage/metadata.desktop | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index fb6780aca..3700d7a45 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -32,7 +32,7 @@ Name[hr]=Zaključavanje/odjavljivanje Name[hsb]=Zamknjenje/Wotzjewjenje Name[hu]=Zárolás/kijelentkezés Name[ia]=Bloca/Claude session -Name[id]=Gembok/Logout +Name[id]=Kunci/Logout Name[is]=Læsa/stimpla út Name[it]=Blocca/Esci Name[ja]=ロック/ログアウト @@ -111,7 +111,7 @@ Comment[hr]=Zaključavanje ekrana ili odjava Comment[hsb]=Wobrazowku zamknyć abo so wotzjewić Comment[hu]=Képernyőzárolás vagy kijelentkezés Comment[ia]=Bloca le schermo o claude session -Comment[id]=Gembok layar atau logout +Comment[id]=Kunci layar atau logout Comment[is]=Læsa skja eða skrá út Comment[it]=Blocca lo schermo o esci Comment[ja]=スクリーンのロックとログアウト @@ -172,7 +172,7 @@ Keywords[gl]=Trancar;saír;durmir;hibernar;cambiar de usuario; Keywords[he]=Lock;Logout;Sleep;Hibernate;Switch User;נעילה;יציא;שינה;מצב שינה;החלפת משתמש Keywords[hu]=Zárolás;Kijelentkezés;Alvó állapot;Hibernálás;Felhasználóváltás; Keywords[ia]=Bloca;Claude session;Dormi; Hiberna;Cambia Usator; -Keywords[id]=Gembok;Logout;Tidur;Hibernasi;Alih Pengguna; +Keywords[id]=Kunci;Logout;Tidur;Hibernasi;Alih Pengguna; Keywords[is]=Læsa;útskrá;svæfa:leggja í dvala;Skipta um notanda; Keywords[it]=Blocca;Esci;Sospendi;Iberna;Cambia utente; Keywords[ja]=ロック;ログアウト;スリープ;ハイバネート;ユーザの切り替え; diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 9b2ebee12..2f672dd23 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -47,7 +47,7 @@ Description[hr]=Jpeg slika Description[hsb]=jpeg-wobraz Description[hu]=JPEG kép Description[ia]=Jpeg-Image -Description[id]=Gambar-Jpeg +Description[id]=Image-Jpeg Description[is]=Jpeg mynd Description[it]=Immagine JPEG Description[ja]=JPEG 画像 diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 92c363268..f0cf54702 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;Penampilan;Look and Feel;Logout;Gembok;Suspensi;Matikan;Hibernasi; +Keywords[id]=Desktop;Ruang Kerja;Penampilan;Look and Feel;Logout;Kunci;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/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop index 0b0d06daf..759e60dd6 100644 --- a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop +++ b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop @@ -17,7 +17,7 @@ Name[fr]=Images de fond d'écran Name[gl]=Fondos de escritorio Name[he]=תמונת רקע Name[hu]=Háttérképek -Name[id]=Citra Wallpaper +Name[id]=Image Wallpaper Name[is]=Bakgrunnsmyndir Name[it]=Immagini di sfondo Name[ja]=壁紙画像 diff --git a/wallpapers/image/imagepackage/metadata.desktop b/wallpapers/image/imagepackage/metadata.desktop index 1c17b0e52..90c050b6e 100644 --- a/wallpapers/image/imagepackage/metadata.desktop +++ b/wallpapers/image/imagepackage/metadata.desktop @@ -33,7 +33,7 @@ Name[hne]=फोटो Name[hr]=Slika Name[hu]=Kép Name[ia]=Image -Name[id]=Citra +Name[id]=Image Name[is]=Mynd Name[it]=Immagine Name[ja]=画像 @@ -91,7 +91,7 @@ Comment[fi]=Kuvatausta Comment[fr]=Affichage d'images en fond d'écran Comment[gl]=Vista de fondo de pantalla para imaxes. Comment[hu]=Háttérkép nézet képekhez -Comment[id]=Tampilan wallpaper untuk citra +Comment[id]=Tampilan wallpaper untuk image Comment[it]=Vista delle immagini di sfondo Comment[ko]=마음에 드는 그림을 배경으로 사용 Comment[nl]=Achtergrondweergave voor afbeeldingen From 99fa6ccc57c5038ffb16d2e999893d55dc91f5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 6 Sep 2018 03:17:23 +0200 Subject: [PATCH 2/4] KRunner: remove no longer existant and unused column from SQL query Summary: The favicon_id is not used in the query results, and may not even exist when the places db has been created with FF 58 or later. In case the column does not exist the query fails completely. BUG: 398305 Test Plan: 1. Create a new FF profile 2. Add some bookmarks 3. Do some queries Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: broulik, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D15305 --- runners/bookmarks/browsers/firefox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runners/bookmarks/browsers/firefox.cpp b/runners/bookmarks/browsers/firefox.cpp index 9ce286aff..80f8c438c 100644 --- a/runners/bookmarks/browsers/firefox.cpp +++ b/runners/bookmarks/browsers/firefox.cpp @@ -87,13 +87,13 @@ QList< BookmarkMatch > Firefox::match(const QString& term, bool addEverything) QString tmpTerm = term; QString query; if (addEverything) { - query = QStringLiteral("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url," \ - "moz_places.favicon_id FROM moz_bookmarks, moz_places WHERE " \ + query = QStringLiteral("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url " \ + "FROM moz_bookmarks, moz_places WHERE " \ "moz_bookmarks.type = 1 AND moz_bookmarks.fk = moz_places.id"); } else { const QString escapedTerm = tmpTerm.replace('\'', QLatin1String("\\'")); - query = QString("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url," \ - "moz_places.favicon_id FROM moz_bookmarks, moz_places WHERE " \ + query = QString("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url " \ + "FROM moz_bookmarks, moz_places WHERE " \ "moz_bookmarks.type = 1 AND moz_bookmarks.fk = moz_places.id AND " \ "(moz_bookmarks.title LIKE '%" + escapedTerm + "%' or moz_places.url LIKE '%" + escapedTerm + "%')"); From fc1e22ba4d864630e9300e50ffee8f69166c1341 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Oct 2018 08:03:01 +0200 Subject: [PATCH 3/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" --- applets/panelspacer/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/panelspacer/metadata.desktop b/applets/panelspacer/metadata.desktop index 75f466218..ef68d1f4e 100644 --- a/applets/panelspacer/metadata.desktop +++ b/applets/panelspacer/metadata.desktop @@ -23,7 +23,7 @@ Name[he]=מרווח לוח Name[hr]=Razmak na traci Name[hu]=Panelelválasztó Name[ia]=Spatiator de pannello -Name[id]=Peruang Panel +Name[id]=Panel Spacer Name[is]=Spjaldabil Name[it]=Spaziatore del pannello Name[ja]=パネルのスペーサー From be3b80e78017cc6668f9227529ad429150c27faa Mon Sep 17 00:00:00 2001 From: Oleg Solovyov Date: Wed, 12 Sep 2018 17:09:33 -0600 Subject: [PATCH 4/4] Plasmashell freezes when trying to get free space info from mounted remote filesystem after losing connection to it Summary: BUG: 397537 Earlier plasmashell assumed that you'll get free space info immediately (which is not true in case of losing connection to server containing a mounted filesystem - statfs will wait for response forever and freeze everything since it's happening in main thread) I moved obtaining that info into different thread so that case won't freeze anything anymore. It creates exactly one thread per one path. If a path is already being processed, new thread won't be created. Also I implemented a timer used to notify about broken connection after 15 seconds. Reviewers: broulik, ngraham, davidedmundson Reviewed By: broulik Subscribers: ngraham, anthonyfieroni, davidedmundson, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D14895 Backported to 5.12 LTS (sans notification due to new strings) for impact to corporate setups CCBUG: 399945 (cherry picked from commit e1c19ce4daf92a14dee44b44d199672034a346c0) --- dataengines/soliddevice/soliddeviceengine.cpp | 29 ++++++++++++++----- dataengines/soliddevice/soliddeviceengine.h | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dataengines/soliddevice/soliddeviceengine.cpp b/dataengines/soliddevice/soliddeviceengine.cpp index d0d222f4b..3d7f54f23 100644 --- a/dataengines/soliddevice/soliddeviceengine.cpp +++ b/dataengines/soliddevice/soliddeviceengine.cpp @@ -25,8 +25,10 @@ #include #include -#include +#include + #include +#include #include @@ -547,12 +549,25 @@ bool SolidDeviceEngine::updateStorageSpace(const QString &udi) return false; } - KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(storageaccess->filePath()); - if (info.isValid()) { - setData(udi, I18N_NOOP("Free Space"), QVariant(info.available())); - setData(udi, I18N_NOOP("Free Space Text"), KFormat().formatByteSize(info.available())); - setData(udi, I18N_NOOP("Size"), QVariant(info.size())); - return true; + QString path = storageaccess->filePath(); + if (!m_paths.contains(path)) { + m_paths.insert(path); + + // create job + KIO::FileSystemFreeSpaceJob *job = KIO::fileSystemFreeSpace(QUrl::fromLocalFile(path)); + + // collect and process info + connect(job, &KIO::FileSystemFreeSpaceJob::result, this, + [this, path, udi](KIO::Job *job, KIO::filesize_t size, KIO::filesize_t available) { + + if (!job->error()) { + setData(udi, I18N_NOOP("Free Space"), QVariant(available)); + setData(udi, I18N_NOOP("Free Space Text"), KFormat().formatByteSize(available)); + setData(udi, I18N_NOOP("Size"), QVariant(size)); + } + + m_paths.remove(path); + }); } return false; diff --git a/dataengines/soliddevice/soliddeviceengine.h b/dataengines/soliddevice/soliddeviceengine.h index 75b7d1fd4..6cc872320 100644 --- a/dataengines/soliddevice/soliddeviceengine.h +++ b/dataengines/soliddevice/soliddeviceengine.h @@ -80,6 +80,8 @@ private: QMap m_devicemap; //udi, corresponding encrypted container udi; QMap m_encryptedContainerMap; + //path, for pending file system free space jobs + QSet m_paths; DeviceSignalMapManager *m_signalmanager; HddTemp *m_temperature;