From 1f9d35db1900a579b6184f98b2f070a34b803bbc Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 20 May 2014 08:31:31 +0200
Subject: [PATCH 1/2] Do not lose translation of Places items if a Dolphin
 window is closed

If the "Places" are updated outside the current Dolphin process,
PlacesItemModel::updateBookmarks() is called, which invokes
PlacesItem::setBookmark(const KBookmark& bookmark) for each item. This
commit ensures that the correct translation is used for system
bookmarks like "Root", "Network", etc.

Without this patch, all Places entries in the remaining Dolphin windows
would switch to US English if one of multiple windows is closed.

See http://lists.kde.org/?t=139660468400004&r=1&w=2 for details.

BUG: 334999
REVIEW: 118207
FIXED-IN: 4.13.2
---
 src/panels/places/placesitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 41f22cce4..539b9263d 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -135,7 +135,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const QString udi = bookmark.metaDataItem("UDI");
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());
-        setText(bookmark.text());
+        setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));
         setUrl(bookmark.url());
     } else {
         initializeDevice(udi);

From 4ecdb8fe6ee4fa0c54486b50289a374c911c4c5a Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 20 May 2014 08:39:56 +0200
Subject: [PATCH 2/2] Remove debug output

This debug output was pushed accidentally in commit
c52ba9446b05e6bc7f890daac406659a9c37c562
---
 src/search/filenamesearchprotocol.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp
index fd7f09a88..38dd26b23 100644
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@ -92,10 +92,7 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory)
         if (!m_regExp || item.name().contains(*m_regExp)) {
             addItem = true;
         } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
-            qDebug() << "### Checking" << item;
             addItem = contentContainsPattern(item.url());
-        } else {
-            qDebug() << "### NOT Checking" << item;
         }
 
         if (addItem) {