8 files changed, 10 insertions, 8 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index f5e3c8bff..caafdd6ee 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -196,6 +196,7 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=مضغوط
+Name[bs]=Sabij
 Name[ca]=Compacte
 Name[ca@valencia]=Compacte
 Name[cs]=Kompaktní
diff --git a/src/main.cpp b/src/main.cpp
index e46c53a91..c262d0679 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "2.1.95",
+                     "2.1.97",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus"));
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 54a18f087..524625991 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -293,6 +293,7 @@ Comment[zh_CN]=配置常规文件管理器设置
 Comment[zh_TW]=設定一般檔案管理員
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير الملفات
+X-KDE-Keywords[bs]=upravitelj datoteka
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index f1f83ad66..26721b11c 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -293,6 +293,7 @@ Comment[zh_CN]=配置文件管理器导航
 Comment[zh_TW]=設定檔案管理員導覽
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير الملفات
+X-KDE-Keywords[bs]=upravitelj datoteka
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 6fa68f3f9..ccea94b0c 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -244,6 +244,7 @@ Comment[zh_CN]=配置文件管理器服务
 Comment[zh_TW]=設定檔案管理員服務
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير الملفات
+X-KDE-Keywords[bs]=upravitelj datoteka
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 71c198be3..236630ac4 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -291,6 +291,7 @@ Comment[zh_CN]=配置文件管理器视图模式
 Comment[zh_TW]=設定檔案管理員檢視模式
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير الملفات
+X-KDE-Keywords[bs]=upravitelj datoteka
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 941083fde..f0fad1976 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -343,10 +343,12 @@ int DolphinView::itemsCount() const
 KFileItemList DolphinView::selectedItems() const
 {
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
+    QList<int> selectedIndexes = selectionManager->selectedItems().toList();
+
+    qSort(selectedIndexes);
 
     KFileItemList selectedItems;
-    QSetIterator<int> it(selectedIndexes);
+    QListIterator<int> it(selectedIndexes);
     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(m_model->fileItem(index));
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index a91f91b1b..65125c3aa 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -162,11 +162,6 @@ void RenameDialog::slotTextChanged(const QString& newName)
 
 void RenameDialog::renameItems()
 {
-    // Currently the items are sorted by the selection order, resort
-    // them by the filename. This assures that the new sort order is similar to
-    // the current filename sort order.
-    qSort(m_items.begin(), m_items.end(), lessThan);
-
     // Iterate through all items and rename them...
     int index = m_spinBox->value();
     foreach (const KFileItem& item, m_items) {