From c652cdc531f7935951d241ecdcda634019c5fbcf Mon Sep 17 00:00:00 2001
From: Script Kiddy <scripty@kde.org>
Date: Thu, 17 Jan 2013 12:48:56 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 73c4cdc09..1a51f025b 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -110,7 +110,7 @@ Comment[lv]=Šis serviss ļauj konfigurēt Dolphin skata režīmus.
 Comment[mai]=ई सेवा अहाँकेँ डॉल्फिन दृश्य मोड केँ विन्यस्त करै दैछ
 Comment[mk]=Овој сервис овозможува конфигурација на режимите за преглед во Делфин.
 Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
-Comment[mr]=ही सेवा तुम्हाला डॉल्फिन दृश्य पद्धतिचे संयोजन करण्यास मदत करते.
+Comment[mr]=ही सेवा तुम्हाला डॉल्फिन दृश्य पद्धतीचे संयोजन करण्यास मदत करते.
 Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin visningsmåter.
 Comment[nds]=Mit dissen Deenst laat sik de Dolphin-Ansichten instellen.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
-- 
cgit v1.3


From 20c3b45449992d62ec4ba86633d17823e9bb4b19 Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 22 Jan 2013 07:13:34 +0100
Subject: Make the "A folder cannot be dropped into itself" message less
 intrusive

Showing this message in the KMessageWidget above the view, which means
that the view contents are moved down, can be extremely annoying
according to user feedback. Just showing the message in the status bar
is probably enough.

BUG: 313466
REVIEW: 108483
FIXED-IN: 4.10.0
---
 src/views/dolphinview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index f0fad1976..502ffd428 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1025,7 +1025,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
 
     const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
     if (!error.isEmpty()) {
-        emit errorMessage(error);
+        emit infoMessage(error);
     }
 
     if (destUrl == url()) {
-- 
cgit v1.3