From 20311c0a1e2ba15098686deb87f1441e614dfa29 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Nov 2018 07:09:58 +0100
Subject: GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 4eaaaac94..cbaf0a71e 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -541,6 +541,7 @@
       <caption xml:lang="pl">Zarządzanie plikami w Dolphinie</caption>
       <caption xml:lang="pt">Gestão de ficheiros no Dolphin</caption>
       <caption xml:lang="pt-BR">Gerenciamento de arquivos no Dolphin</caption>
+      <caption xml:lang="ru">Управление файлами</caption>
       <caption xml:lang="sv">Filhantering i Dolphin</caption>
       <caption xml:lang="uk">Керування файлами у Dolphin</caption>
       <caption xml:lang="x-test">xxFile management in Dolphinxx</caption>
-- 
cgit v1.3


From fa5f13af6c81c9829bb9f92b7271042947c3163c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 21 Nov 2018 07:17:05 +0100
Subject: GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index cbaf0a71e..d13d6a05a 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -536,6 +536,7 @@
       <caption xml:lang="en-GB">File management in Dolphin</caption>
       <caption xml:lang="es">Gestión de archivos en Dolphin</caption>
       <caption xml:lang="gl">Xestión de ficheiros en Dolphin</caption>
+      <caption xml:lang="it">Gestione dei file in Dolphin</caption>
       <caption xml:lang="nl">Bestandsbeheer in Dolphin</caption>
       <caption xml:lang="nn">Filhandsaming i Dolphin</caption>
       <caption xml:lang="pl">Zarządzanie plikami w Dolphinie</caption>
-- 
cgit v1.3


From 60e5c1bd8e6ee40d96d574171c4295661dd2e3aa Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 29 Nov 2018 07:07:18 +0100
Subject: GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index d13d6a05a..6797c6e1b 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -535,6 +535,7 @@
       <caption xml:lang="de">Dateiverwaltung mit Dolphin</caption>
       <caption xml:lang="en-GB">File management in Dolphin</caption>
       <caption xml:lang="es">Gestión de archivos en Dolphin</caption>
+      <caption xml:lang="fi">Tiedostonhallinta Dolphinissa</caption>
       <caption xml:lang="gl">Xestión de ficheiros en Dolphin</caption>
       <caption xml:lang="it">Gestione dei file in Dolphin</caption>
       <caption xml:lang="nl">Bestandsbeheer in Dolphin</caption>
-- 
cgit v1.3


From 6100f66ae2ba5ae50c2fcc263b6faaa695d37948 Mon Sep 17 00:00:00 2001
From: Thomas Surrel <thomas.surrel@protonmail.com>
Date: Tue, 20 Nov 2018 12:10:15 +0100
Subject: Fix selection when navigating back, with size sorting.

Summary:
KItemListSelectionManager::itemsMoved (called when sorting by size)
was re-activating anchor selection regardless if we actually were
doing an anchored selection. This was leading to an incorrect
selection when navigating back.

BUG: 352296

Test Plan:
In any folder, sort by size then move to a subfolder. Navigate back
to the parent folder: only the parent folder should be selected.

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: elvisangelaccio, broulik, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D17042
---
 src/kitemviews/kitemlistselectionmanager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index f5e097c02..d16c5e2d3 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -331,6 +331,9 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();
 
+    // Store whether we were doing an anchored selection
+    const bool wasInAnchoredSelection = isAnchoredSelectionActive();
+
     // endAnchoredSelection() adds all items between m_currentItem and
     // m_anchorItem to m_selectedItems. They can then be moved
     // individually later in this function.
@@ -348,7 +351,9 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
     }
 
     // Start a new anchored selection.
-    beginAnchoredSelection(m_currentItem);
+    if (wasInAnchoredSelection) {
+        beginAnchoredSelection(m_currentItem);
+    }
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {
-- 
cgit v1.3