From c39ce059d6200f4011b3659592f9c658a3ce3c33 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 18 Dec 2021 02:14:50 +0000
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 23a4721af..3d9a08191 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -357,6 +357,7 @@
       <caption xml:lang="ko">Dolphin에 내장된 터미널</caption>
       <caption xml:lang="my">လင်းပိုင်တွင် မြှပ်သွင်း-တာမီနယ်</caption>
       <caption xml:lang="nl">Ingebedde terminal in Dolphin</caption>
+      <caption xml:lang="nn">Innebygd terminal i Dolphin</caption>
       <caption xml:lang="pl">Osadzony terminal w Dolphinie</caption>
       <caption xml:lang="pt">Terminal Incorporado no Dolphin</caption>
       <caption xml:lang="pt-BR">Terminal incorporado no Dolphin</caption>
-- 
cgit v1.3


From b2c137fdb7e552131c5a31db657f395f2f09e672 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 17 Dec 2021 22:43:15 +0100
Subject: Use QUrl::toDisplayString when presenting to the user

Strips out password information
---
 src/dolphinmainwindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index cdbeba172..fa105b15a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -750,7 +750,7 @@ void DolphinMainWindow::slotAboutToShowBackPopupMenu()
     int entries = 0;
     m_backAction->menu()->clear();
     for (int i = urlNavigator->historyIndex() + 1; i < urlNavigator->historySize() && entries < MaxNumberOfNavigationentries; ++i, ++entries) {
-        QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_backAction->menu());
+        QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_backAction->menu());
         action->setData(i);
         m_backAction->menu()->addAction(action);
     }
@@ -779,7 +779,7 @@ void DolphinMainWindow::slotAboutToShowForwardPopupMenu()
     int entries = 0;
     m_forwardAction->menu()->clear();
     for (int i = urlNavigator->historyIndex() - 1; i >= 0 && entries < MaxNumberOfNavigationentries; --i, ++entries) {
-        QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_forwardAction->menu());
+        QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_forwardAction->menu());
         action->setData(i);
         m_forwardAction->menu()->addAction(action);
     }
-- 
cgit v1.3