From c52d57d872b5ac6d113ad16ebbeda6e667be33e9 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Mon, 10 Dec 2012 11:27:21 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 1 + src/settings/kcm/kcmdolphingeneral.desktop | 1 + src/settings/kcm/kcmdolphinnavigation.desktop | 1 + src/settings/kcm/kcmdolphinservices.desktop | 1 + src/settings/kcm/kcmdolphinviewmodes.desktop | 1 + src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 6 files changed, 6 insertions(+) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 987f70472c..f5e3c8bff4 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -207,6 +207,7 @@ Name[et]=Kompaktne Name[fi]=Tiivis Name[fr]=Concis Name[ga]=Dlúth +Name[gl]=Compacto Name[hu]=Kompakt Name[ia]=Compacte Name[it]=Compatta diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index de9dfc0c68..54a18f0874 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -304,6 +304,7 @@ X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[ga]=bainisteoir comhad +X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[it]=gestore dei file diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index e05f15d347..f1f83ad663 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -304,6 +304,7 @@ X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[ga]=bainisteoir comhad +X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[it]=gestore dei file diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index a87b962408..6fa68f3f92 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -255,6 +255,7 @@ X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[ga]=bainisteoir comhad +X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[it]=gestore dei file diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 328f664666..71c198be36 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -302,6 +302,7 @@ X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[ga]=bainisteoir comhad +X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[it]=gestore dei file diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index c39ac7695a..f6616d167e 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,6 +22,7 @@ Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers Comment[fy]=Ferzje kontrôle plugin foar triem werjeften Comment[ga]=Breiseán rialaithe leaganacha le haghaidh Amhairc Chomhad +Comment[gl]=Complemento de control de versións para as vistas dos ficheiros Comment[he]=תוסף ניהול גרסאות עבור תצוגת קבצים Comment[hr]=Priključak sustava kontrole inačica za prikaz datoteka Comment[hu]=Verziókövető modul fájlnézetekhez From fe5c03fb588792a454552bf805b15300768f16f8 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 12 Dec 2012 22:57:20 +0100 Subject: [PATCH 2/2] Fix Bug 240820 - [Usability Bug] Handling Bad Filenames, dolphin gives unclear error message Fix Bug 308597 - Regression: Renaming a file/folder to something that contains a "/" will result in several message boxes Uses the same solution as Dolphin-Rename-Dialog does. (KIO::encodeFileName) BUG: 240820 BUG: 308597 REVIEW: 107681 FIXED-IN: 4.9.5 --- src/kitemviews/private/kitemlistroleeditor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 1e4b5fd4e0..4f40060109 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -20,6 +20,7 @@ #include "kitemlistroleeditor.h" #include +#include #include KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : @@ -93,7 +94,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) // a roleEditingFinished signal (see KItemListRoleEditor::event), // which is not wanted in this case. m_blockFinishedSignal = true; - emit roleEditingCanceled(m_index, m_role, toPlainText()); + emit roleEditingCanceled(m_index, m_role, KIO::encodeFileName(toPlainText())); m_blockFinishedSignal = false; event->accept(); return; @@ -137,7 +138,7 @@ void KItemListRoleEditor::autoAdjustSize() void KItemListRoleEditor::emitRoleEditingFinished() { if (!m_blockFinishedSignal) { - emit roleEditingFinished(m_index, m_role, toPlainText()); + emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText())); } }