From 13258e00c562cdd7aa1f812fffbf5b5edd095828 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 23 May 2019 07:22:07 +0200
Subject: GIT_SILENT made messages (after extraction)

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

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index d850b0916..011bad45f 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -453,7 +453,7 @@
       <li xml:lang="he">תמיכה בביטול וביצוע חוזר</li>
       <li xml:lang="hu">Visszavonás/ismétlés támogatás</li>
       <li xml:lang="ia">Supporto de annulla/reface</li>
-      <li xml:lang="id">Dukungan takjadi/jadilagi</li>
+      <li xml:lang="id">Dukungan urungkan/lanjurkan</li>
       <li xml:lang="it">Supporto di annulla/rifai</li>
       <li xml:lang="ko">실행 취소/다시 실행 지원</li>
       <li xml:lang="nb">Støtte for angring/omgjøring</li>
-- 
cgit v1.3


From c43165a1c42f623a5b183c84083633df9cf35e93 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Tue, 4 Jun 2019 08:58:28 +0200
Subject: [Places Panel] Pass iconName to KFilePlaceEditDialog

Ensures that editing an entry with a custom icon doesn't have its icon discarded.

Differential Revision: https://phabricator.kde.org/D21558
---
 src/panels/places/placespanel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 224eb0c64..4e99daf7a 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -490,9 +490,10 @@ void PlacesPanel::editEntry(int index)
     QHash<QByteArray, QVariant> data = m_model->data(index);
     const QUrl url = data.value("url").toUrl();
     const QString text = data.value("text").toString();
+    const QString iconName = data.value("iconName").toString();
     const bool applicationLocal = !data.value("applicationName").toString().isEmpty();
 
-    QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, QString(), true, applicationLocal, KIconLoader::SizeMedium, this);
+    QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, iconName, true, applicationLocal, KIconLoader::SizeMedium, this);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);
         if (oldItem) {
-- 
cgit v1.3