diff options
| author | Frank Reininghaus <[email protected]> | 2014-05-21 22:49:40 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-05-21 22:49:40 +0200 |
| commit | a46121dc510f987f2d164b43eaf5f84ea8c83cb8 (patch) | |
| tree | 5dd88b57e12f29b1dba631bd2add37c98145d922 /src/panels | |
| parent | 6edcabf9a098ba9cb5099443a9cd227453a3f72b (diff) | |
| parent | f27c1242371db1e69edab78f0bbca05206f47adf (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/search/filenamesearchprotocol.cpp
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/places/placesitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 41c2e809f..1729bbd19 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); |