FYI, this bugfix includes a small i18n change with hopes to avoid a data loss from people making the wrong choice. ---------- Forwarded Message ---------- Subject: KDE/kdebase/apps/konqueror/settings/konq Date: Saturday 28 November 2009 From: David Faure To: kde-commits@kde.org Cc: SVN commit 1055427 by dfaure: Don't move the home directory just because some path used to point to it. Don't even offer it ;) BUG: 193057 M +7 -1 globalpaths.cpp --- trunk/KDE/kdebase/apps/konqueror/settings/konq/globalpaths.cpp #1055426:1055427 @@ -323,6 +323,12 @@ return true; if (!QFile::exists(src.toLocalFile())) return true; + // Do not move $HOME! #193057 + const QString translatedPath = translatePath(src.toLocalFile()); + if (translatedPath == "$HOME" || translatedPath == "$HOME/") { + return true; + } + m_ok = true; QString question; @@ -336,7 +342,7 @@ yesItem = KGuiItem(i18nc("Move files from old to new place", "Move")); noItem = KGuiItem(i18nc("Use the new directory but do not move files", "Do not Move")); } else { - question = i18n("The path for '%1' has been changed.\nDo you want to move '%2' to '%3'?", + question = i18n("The path for '%1' has been changed.\nDo you want to move the directory '%2' to '%3'?", type, src.toLocalFile(), dest.toLocalFile()); yesItem = KGuiItem(i18nc("Move the directory", "Move")); ------------------------------------------------------- -- David Faure, faure@kde.org, http://www.davidfaure.fr Sponsored by Nokia to work on KDE, incl. Konqueror (http://www.konqueror.org).