From fc56fb60c19301952bccd69ffad822914880d368 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 31 Dec 2020 08:27:23 +0100 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 42e4104ae..fe2050ce0 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -350,7 +350,7 @@
  • Lisateave ja otseteed dokitavate paneelidena, mida saab vabalt vajalikku kohta tõsta ja panna näitama just vajalikku teavet.
  • Informazio eta lasterbide osagarriak erabilgarri daude panel ainguragarrien bidez, haiek askatasun osoz mugitu ditzakezu eta zehazki nahi duzuna bistaratu.
  • Lisätiedoille ja oikoteille on paneelit, joita voi siirtää sekä näyttää ja piilottaa vapaasti.
    • -
  • Des informations supplémentaires et des raccourcis sont disponible comme panneaux ancrable librement déplaçable et affichant exactement ce que vous voulez.
    • +
  • Des informations supplémentaires et des raccourcis sont disponibles comme des panneaux ancrables, librement déplaçable et affichant exactement ce que vous voulez.
  • Información adicional e atallos dispoñíbeis como paneis acoplábeis que pode colocar en calquera parte e mostrar como prefira.
  • További információk és gyorsbillentyűk érhetők el dokkolható panelekként, lehetővé téve azok szabad mozgatását, illetve pontosan úgy megjelenítve, ahogy szeretné.
  • Information additional e vias breve es disponibile como pannellos de basin (dock-panels), il permitte mover los liberemente e monstrar los exactemente como tu vole.
    • @@ -594,7 +594,7 @@ Failihaldus Dolphinis Fitxategi-kudeaketa Dolphin-ekin Tiedostonhallinta Dolphinissa - Gestion de fichiers dans Dophin + Gestion de fichiers dans Dolphin Xestión de ficheiros en Dolphin ניהול קבצים ב־Dolphin Fájlkezelés a Dolphinban -- cgit v1.3 From 65ad995a8eaf8596bd19f66c519efdd7b604cc92 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jan 2021 09:05:17 +0100 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index fe2050ce0..8a00fab4b 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -618,7 +618,7 @@ Керування файлами у Dolphin Quản lí tệp trong Dolphin xxFile management in Dolphinxx - 在 Dolphin 中管理文件 + 用 Dolphin 进行文件管理 在 Dolphin 管理檔案 https://kde.org/images/screenshots/dolphin.png -- cgit v1.3 From 26ae39c230ba757970f3f9386035d7318a16a217 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sat, 2 Jan 2021 14:13:04 +0100 Subject: GIT_SILENT Upgrade release service version to 20.12.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c86a14cb1..2dd959ffb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "20") set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "0") +set (RELEASE_SERVICE_VERSION_MICRO "1") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) -- cgit v1.3 From 35104c052fd2e4490126f91dff34bfed26ddc986 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sat, 2 Jan 2021 14:42:54 +0100 Subject: GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 8a00fab4b..24d644462 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -628,9 +628,9 @@ dolphin + - -- cgit v1.3 From 764861af51ec0a4f124886567725f9950961f6e6 Mon Sep 17 00:00:00 2001 From: The Imp Date: Wed, 13 Jan 2021 09:28:58 +0000 Subject: Change copy location shortcut in dolphin so as to not conflict with Konsole panel BUG: 426461 FIXED-IN: 20.12.2 --- src/views/dolphinviewactionhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index a2cb89a58..f3e3f95a3 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -149,7 +149,7 @@ void DolphinViewActionHandler::createActions() )); copyPathAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy"))); - m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL + Qt::SHIFT + Qt::Key_C}); + m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL | Qt::ALT | Qt::Key_C}); connect(copyPathAction, &QAction::triggered, this, &DolphinViewActionHandler::slotCopyPath); -- cgit v1.3 From a6d095fa0450237f89e240da99877f6c79b46ecc Mon Sep 17 00:00:00 2001 From: Ilia Kats Date: Tue, 12 Jan 2021 19:24:31 +0100 Subject: fix folder size calculation on FUSE and network file systems KFileItem::isSlow uses hardcoded logic that returns true if the filesystem is Smb or Nfs. However, KFileSystemType::determineFileSystemTypeImpl on Linux returns Nfs also if the file system in question is a FUSE file system, which includes NTFS, sshfs, and others. BUG: 430778 BUG: 431106 --- src/kitemviews/kfileitemmodelrolesupdater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 075ec888a..566f228f6 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -1085,7 +1085,7 @@ QHash KFileItemModelRolesUpdater::rolesData(const KFileIte const bool getIsExpandableRole = m_roles.contains("isExpandable"); if ((getSizeRole || getIsExpandableRole) && item.isDir()) { - if (item.isLocalFile() && !item.isSlow()) { + if (item.isLocalFile()) { // Tell m_directoryContentsCounter that we want to count the items // inside the directory. The result will be received in slotDirectoryContentsCountReceived. if (m_scanDirectories) { -- cgit v1.3