diff -Nru kde-baseapps-4.9.4/debian/changelog kde-baseapps-4.9.5/debian/changelog
--- kde-baseapps-4.9.4/debian/changelog	2012-12-29 19:11:35.000000000 +0000
+++ kde-baseapps-4.9.5/debian/changelog	2013-02-24 22:23:33.000000000 +0000
@@ -1,3 +1,13 @@
+kde-baseapps (4:4.9.5-0ubuntu0.1) quantal; urgency=low
+
+  * New upstream bugfix release (LP: #1094523)
+    - drop 0001-Added-curly-brackets-around-DolphinApplication-creat.patch,
+      0002-Fix-incorrect-usage-of-list-iterators.patch and
+      0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch,
+      applied upstream
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Sun, 30 Dec 2012 21:22:47 +0100
+
 kde-baseapps (4:4.9.4-0ubuntu0.1) quantal; urgency=low
 
   * New upstream bugfix release (LP: #1085516)
diff -Nru kde-baseapps-4.9.4/debian/control kde-baseapps-4.9.5/debian/control
--- kde-baseapps-4.9.4/debian/control	2012-12-01 23:45:45.000000000 +0000
+++ kde-baseapps-4.9.5/debian/control	2012-12-30 20:22:46.000000000 +0000
@@ -8,7 +8,7 @@
  José Manuel Santamaría Lema <panfaust@gmail.com>, Eshat Cakar <info@eshat.de>
 Build-Depends: 
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), libdlrestrictions-dev (>= 0.14),
- kdelibs5-dev (>= 4:4.9.4), libphonon-dev (>= 4:4.3.0),
+ kdelibs5-dev (>= 4:4.9.5), libphonon-dev (>= 4:4.3.0),
  libqimageblitz-dev (>= 1:0.0.4-2), libxkbfile-dev,
  libstreamanalyzer-dev (>= 0.6.3),
  libxrender-dev, zlib1g-dev,
diff -Nru kde-baseapps-4.9.4/debian/patches/0001-Added-curly-brackets-around-DolphinApplication-creat.patch kde-baseapps-4.9.5/debian/patches/0001-Added-curly-brackets-around-DolphinApplication-creat.patch
--- kde-baseapps-4.9.4/debian/patches/0001-Added-curly-brackets-around-DolphinApplication-creat.patch	2012-12-08 14:22:19.000000000 +0000
+++ kde-baseapps-4.9.5/debian/patches/0001-Added-curly-brackets-around-DolphinApplication-creat.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-From 5343a18b50e990d75f4434b3bb70b376ab935076 Mon Sep 17 00:00:00 2001
-From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
-Date: Wed, 5 Dec 2012 21:44:06 +0100
-Subject: [PATCH 1/3] Added curly brackets around DolphinApplication creation
- and execution, to make sure it is deleted before
- "return 0;" is called. This might prevent random
- crashes due to the de-allocation chain in Qt at exit.
- CCBUG: 311092
-
----
- dolphin/src/main.cpp | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/dolphin/src/main.cpp b/dolphin/src/main.cpp
-index 39ecee8..6dd2b1e 100644
---- a/dolphin/src/main.cpp
-+++ b/dolphin/src/main.cpp
-@@ -82,11 +82,13 @@ KDE_EXPORT int kdemain(int argc, char **argv)
-     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
-     KCmdLineArgs::addCmdLineOptions(options);
- 
--    DolphinApplication app;
--    if (app.isSessionRestored()) {
--        app.restoreSession();
-+    {
-+        DolphinApplication app;
-+        if (app.isSessionRestored()) {
-+            app.restoreSession();
-+        }
-+        app.exec(); // krazy:exclude=crashy
-     }
--    app.exec(); // krazy:exclude=crashy
- 
-     return 0;
- }
--- 
-1.8.0
-
diff -Nru kde-baseapps-4.9.4/debian/patches/0002-Fix-incorrect-usage-of-list-iterators.patch kde-baseapps-4.9.5/debian/patches/0002-Fix-incorrect-usage-of-list-iterators.patch
--- kde-baseapps-4.9.4/debian/patches/0002-Fix-incorrect-usage-of-list-iterators.patch	2012-12-08 14:22:19.000000000 +0000
+++ kde-baseapps-4.9.5/debian/patches/0002-Fix-incorrect-usage-of-list-iterators.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-From 6d0f9ada0198f6e73a8fca1e709676d0ac83a67b Mon Sep 17 00:00:00 2001
-From: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Thu, 6 Dec 2012 19:43:11 +0100
-Subject: [PATCH 2/3] Fix incorrect usage of list iterators
-
-The problem was that we erased an iterator from the list and then
-incremented it. This can lead to problems (namely, random crashes) if
-the iterator pointed to the last list element.
-
-Thanks to Sandro Mani for testing the patch!
-
-BUG: 311246
-FIXED-IN: 4.9.5
----
- dolphin/src/views/dolphinview.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
- 
-         QSet<int> selectedItems = selectionManager->selectedItems();
- 
--        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+        QList<KUrl>::iterator it = m_selectedUrls.begin();
-+        while (it != m_selectedUrls.end()) {
-             const int index = m_model->index(*it);
-             if (index >= 0) {
-                 selectedItems.insert(index);
--                m_selectedUrls.erase(it);
-+                it = m_selectedUrls.erase(it);
-+            } else {
-+                 ++it;
-             }
-         }
- 
--- 
-1.8.0
-
diff -Nru kde-baseapps-4.9.4/debian/patches/0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch kde-baseapps-4.9.5/debian/patches/0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch
--- kde-baseapps-4.9.4/debian/patches/0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch	2012-12-08 14:22:19.000000000 +0000
+++ kde-baseapps-4.9.5/debian/patches/0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-From 620f9670af432c8c7a79fd47789da1788d7d6b17 Mon Sep 17 00:00:00 2001
-From: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Fri, 7 Dec 2012 22:15:32 +0100
-Subject: [PATCH 3/3] Fix keyboard focus handling after renaming items inline
-
-This reverts 951cb9c35d7a9ef814b3de5b359915968da9b881 and
-3143acc084d54d43df469b54762bfa10a7050a9f, and fixes the crash caused by
-nested event loops by delaying the deletion of the KItemListRoleEditor
-until the next item is renamed inline.
-
-BUG: 311206
-FIXED-IN: 4.9.5
-REVIEW: 107606
----
- dolphin/src/kitemviews/kstandarditemlistwidget.cpp | 31 +++++++------
- dolphin/src/kitemviews/kstandarditemlistwidget.h   |  1 +
- .../src/kitemviews/private/kitemlistroleeditor.cpp | 52 ++--------------------
- .../src/kitemviews/private/kitemlistroleeditor.h   | 12 -----
- 4 files changed, 21 insertions(+), 75 deletions(-)
-
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
-     m_additionalInfoTextColor(),
-     m_overlay(),
-     m_rating(),
--    m_roleEditor(0)
-+    m_roleEditor(0),
-+    m_oldRoleEditor(0)
- {
- }
- 
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
-     m_textInfo.clear();
- 
-     delete m_roleEditor;
-+    delete m_oldRoleEditor;
- }
- 
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
-                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--            // Do not delete the role editor using deleteLater() because we might be
--            // inside a nested event loop which has been started by one of its event
--            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--            m_roleEditor->deleteWhenIdle();
-+            m_oldRoleEditor = m_roleEditor;
-+            m_roleEditor->hide();
-             m_roleEditor = 0;
-         }
-         return;
-+    } else if (m_oldRoleEditor) {
-+        // Delete the old editor before constructing the new one to
-+        // prevent a memory leak.
-+        m_oldRoleEditor->deleteLater();
-+        m_oldRoleEditor = 0;
-     }
- 
-     Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
- 
- void KStandardItemListWidget::closeRoleEditor()
- {
-+    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
-     if (m_roleEditor->hasFocus()) {
-         // If the editing was not ended by a FocusOut event, we have
-         // to transfer the keyboard focus back to the KItemListContainer.
-         scene()->views()[0]->parentWidget()->setFocus();
-     }
- 
--    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
--    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
--    // Do not delete the role editor using deleteLater() because we might be
--    // inside a nested event loop which has been started by one of its event
--    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--    m_roleEditor->deleteWhenIdle();
-+    m_oldRoleEditor = m_roleEditor;
-+    m_roleEditor->hide();
-     m_roleEditor = 0;
- }
- 
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
-     QPixmap m_rating;
- 
-     KItemListRoleEditor* m_roleEditor;
-+    KItemListRoleEditor* m_oldRoleEditor;
- 
-     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
-                                                    // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
-     KTextEdit(parent),
-     m_index(0),
-     m_role(),
--    m_blockFinishedSignal(false),
--    m_eventHandlingLevel(0),
--    m_deleteAfterEventHandling(false)
-+    m_blockFinishedSignal(false)
- {
-     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
-     return m_role;
- }
- 
--void KItemListRoleEditor::deleteWhenIdle()
--{
--    if (m_eventHandlingLevel > 0) {
--        // We are handling an event at the moment. It could be that we
--        // are in a nested event loop run by contextMenuEvent() or a
--        // call of mousePressEvent() which results in drag&drop.
--        // -> do not call deleteLater() to prevent a crash when we
--        //    return from the nested event loop.
--        m_deleteAfterEventHandling = true;
--    } else {
--        deleteLater();
--    }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
-     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- 
- bool KItemListRoleEditor::event(QEvent* event)
- {
--    ++m_eventHandlingLevel;
--
-     if (event->type() == QEvent::FocusOut) {
-         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
-         if (focusEvent->reason() != Qt::PopupFocusReason) {
-             emitRoleEditingFinished();
-         }
-     }
--
--    const int result = KTextEdit::event(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
--    ++m_eventHandlingLevel;
--    const bool result = KTextEdit::viewportEvent(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
-+    return KTextEdit::event(event);
- }
- 
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-         return;
-     case Qt::Key_Enter:
-     case Qt::Key_Return:
--        // TODO: find a better way to fix the bug 309760
--        clearFocus(); // emitRoleEditingFinished(); results in a crash
-+        emitRoleEditingFinished();
-         event->accept();
-         return;
-     default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
-     void setRole(const QByteArray& role);
-     QByteArray role() const;
- 
--    /**
--     * Calls deleteLater() if no event is being handled at the moment.
--     * Otherwise, the deletion is deferred until the event handling is
--     * finished. This prevents that the deletion happens inside a nested
--     * event loop which might be run in contextMenuEvent() or
--     * mouseMoveEvent() because this would probably cause a crash.
--     */
--    void deleteWhenIdle();
--
-     virtual bool eventFilter(QObject* watched, QEvent* event);
- 
- signals:
-@@ -64,7 +55,6 @@ signals:
- 
- protected:
-     virtual bool event(QEvent* event);
--    virtual bool viewportEvent(QEvent* event);
-     virtual void keyPressEvent(QKeyEvent* event);
- 
- private slots:
-@@ -85,8 +75,6 @@ private:
-     int m_index;
-     QByteArray m_role;
-     bool m_blockFinishedSignal;
--    int m_eventHandlingLevel;
--    bool m_deleteAfterEventHandling;
- };
- 
- #endif
--- 
-1.8.0
-
diff -Nru kde-baseapps-4.9.4/debian/patches/series kde-baseapps-4.9.5/debian/patches/series
--- kde-baseapps-4.9.4/debian/patches/series	2012-12-08 14:22:19.000000000 +0000
+++ kde-baseapps-4.9.5/debian/patches/series	2012-12-30 20:38:08.000000000 +0000
@@ -5,6 +5,3 @@
 kubuntu_install_flash.diff
 kubuntu_folderview_livecd_directory.diff
 kubuntu_folderwidget_drawing.diff
-0001-Added-curly-brackets-around-DolphinApplication-creat.patch
-0002-Fix-incorrect-usage-of-list-iterators.patch
-0003-Fix-keyboard-focus-handling-after-renaming-items-inl.patch
Binary files /tmp/6bbkTthoXT/kde-baseapps-4.9.4/doc/dolphin/index.cache.bz2 and /tmp/Td17r6FtWD/kde-baseapps-4.9.5/doc/dolphin/index.cache.bz2 differ
Binary files /tmp/6bbkTthoXT/kde-baseapps-4.9.4/doc/konqueror/index.cache.bz2 and /tmp/Td17r6FtWD/kde-baseapps-4.9.5/doc/konqueror/index.cache.bz2 differ
diff -Nru kde-baseapps-4.9.4/dolphin/src/dolphinpart.desktop kde-baseapps-4.9.5/dolphin/src/dolphinpart.desktop
--- kde-baseapps-4.9.4/dolphin/src/dolphinpart.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/dolphinpart.desktop	2012-12-27 17:55:28.240824304 +0000
@@ -196,6 +196,7 @@
 [Desktop Action compact]
 Name=Compact
 Name[ar]=مضغوط
+Name[bs]=Sabij
 Name[ca]=Compacte
 Name[ca@valencia]=Compacte
 Name[cs]=Kompaktní
@@ -207,6 +208,7 @@
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[ga]=Dlúth
+Name[gl]=Compacto
 Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[it]=Compatta
diff -Nru kde-baseapps-4.9.4/dolphin/src/kitemviews/kstandarditemlistwidget.cpp kde-baseapps-4.9.5/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
--- kde-baseapps-4.9.4/dolphin/src/kitemviews/kstandarditemlistwidget.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/kitemviews/kstandarditemlistwidget.cpp	2012-12-27 17:55:28.240824304 +0000
@@ -193,7 +193,8 @@
     m_additionalInfoTextColor(),
     m_overlay(),
     m_rating(),
-    m_roleEditor(0)
+    m_roleEditor(0),
+    m_oldRoleEditor(0)
 {
 }
 
@@ -203,6 +204,7 @@
     m_textInfo.clear();
 
     delete m_roleEditor;
+    delete m_oldRoleEditor;
 }
 
 void KStandardItemListWidget::setLayout(Layout layout)
@@ -609,13 +611,16 @@
                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-            // Do not delete the role editor using deleteLater() because we might be
-            // inside a nested event loop which has been started by one of its event
-            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-            m_roleEditor->deleteWhenIdle();
+            m_oldRoleEditor = m_roleEditor;
+            m_roleEditor->hide();
             m_roleEditor = 0;
         }
         return;
+    } else if (m_oldRoleEditor) {
+        // Delete the old editor before constructing the new one to
+        // prevent a memory leak.
+        m_oldRoleEditor->deleteLater();
+        m_oldRoleEditor = 0;
     }
 
     Q_ASSERT(!m_roleEditor);
@@ -1267,21 +1272,19 @@
 
 void KStandardItemListWidget::closeRoleEditor()
 {
+    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
+               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
+    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+
     if (m_roleEditor->hasFocus()) {
         // If the editing was not ended by a FocusOut event, we have
         // to transfer the keyboard focus back to the KItemListContainer.
         scene()->views()[0]->parentWidget()->setFocus();
     }
 
-    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-
-    // Do not delete the role editor using deleteLater() because we might be
-    // inside a nested event loop which has been started by one of its event
-    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-    m_roleEditor->deleteWhenIdle();
+    m_oldRoleEditor = m_roleEditor;
+    m_roleEditor->hide();
     m_roleEditor = 0;
 }
 
diff -Nru kde-baseapps-4.9.4/dolphin/src/kitemviews/kstandarditemlistwidget.h kde-baseapps-4.9.5/dolphin/src/kitemviews/kstandarditemlistwidget.h
--- kde-baseapps-4.9.4/dolphin/src/kitemviews/kstandarditemlistwidget.h	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/kitemviews/kstandarditemlistwidget.h	2012-12-27 17:55:28.240824304 +0000
@@ -241,6 +241,7 @@
     QPixmap m_rating;
 
     KItemListRoleEditor* m_roleEditor;
+    KItemListRoleEditor* m_oldRoleEditor;
 
     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
                                                    // share a common layout calculation
diff -Nru kde-baseapps-4.9.4/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp kde-baseapps-4.9.5/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
--- kde-baseapps-4.9.4/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp	2012-12-27 17:55:28.244824254 +0000
@@ -20,15 +20,14 @@
 #include "kitemlistroleeditor.h"
 
 #include <KDebug>
+#include <kio/global.h>
 #include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
     m_index(0),
     m_role(),
-    m_blockFinishedSignal(false),
-    m_eventHandlingLevel(0),
-    m_deleteAfterEventHandling(false)
+    m_blockFinishedSignal(false)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -66,20 +65,6 @@
     return m_role;
 }
 
-void KItemListRoleEditor::deleteWhenIdle()
-{
-    if (m_eventHandlingLevel > 0) {
-        // We are handling an event at the moment. It could be that we
-        // are in a nested event loop run by contextMenuEvent() or a
-        // call of mousePressEvent() which results in drag&drop.
-        // -> do not call deleteLater() to prevent a crash when we
-        //    return from the nested event loop.
-        m_deleteAfterEventHandling = true;
-    } else {
-        deleteLater();
-    }
-}
-
 bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {
@@ -91,42 +76,13 @@
 
 bool KItemListRoleEditor::event(QEvent* event)
 {
-    ++m_eventHandlingLevel;
-
     if (event->type() == QEvent::FocusOut) {
         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
         if (focusEvent->reason() != Qt::PopupFocusReason) {
             emitRoleEditingFinished();
         }
     }
-
-    const int result = KTextEdit::event(event);
-    --m_eventHandlingLevel;
-
-    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-        // Schedule this object for deletion and make sure that we do not try
-        // to deleteLater() again when the DeferredDelete event is received.
-        deleteLater();
-        m_deleteAfterEventHandling = false;
-    }
-
-    return result;
-}
-
-bool KItemListRoleEditor::viewportEvent(QEvent* event)
-{
-    ++m_eventHandlingLevel;
-    const bool result = KTextEdit::viewportEvent(event);
-    --m_eventHandlingLevel;
-
-    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-        // Schedule this object for deletion and make sure that we do not try
-        // to deleteLater() again when the DeferredDelete event is received.
-        deleteLater();
-        m_deleteAfterEventHandling = false;
-    }
-
-    return result;
+    return KTextEdit::event(event);
 }
 
 void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
@@ -138,14 +94,13 @@
         // 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;
     case Qt::Key_Enter:
     case Qt::Key_Return:
-        // TODO: find a better way to fix the bug 309760
-        clearFocus(); // emitRoleEditingFinished(); results in a crash
+        emitRoleEditingFinished();
         event->accept();
         return;
     default:
@@ -183,7 +138,7 @@
 void KItemListRoleEditor::emitRoleEditingFinished()
 {
     if (!m_blockFinishedSignal) {
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText()));
     }
 }
 
diff -Nru kde-baseapps-4.9.4/dolphin/src/kitemviews/private/kitemlistroleeditor.h kde-baseapps-4.9.5/dolphin/src/kitemviews/private/kitemlistroleeditor.h
--- kde-baseapps-4.9.4/dolphin/src/kitemviews/private/kitemlistroleeditor.h	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/kitemviews/private/kitemlistroleeditor.h	2012-12-27 17:55:28.244824254 +0000
@@ -47,15 +47,6 @@
     void setRole(const QByteArray& role);
     QByteArray role() const;
 
-    /**
-     * Calls deleteLater() if no event is being handled at the moment.
-     * Otherwise, the deletion is deferred until the event handling is
-     * finished. This prevents that the deletion happens inside a nested
-     * event loop which might be run in contextMenuEvent() or
-     * mouseMoveEvent() because this would probably cause a crash.
-     */
-    void deleteWhenIdle();
-
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
 signals:
@@ -64,7 +55,6 @@
 
 protected:
     virtual bool event(QEvent* event);
-    virtual bool viewportEvent(QEvent* event);
     virtual void keyPressEvent(QKeyEvent* event);
 
 private slots:
@@ -85,8 +75,6 @@
     int m_index;
     QByteArray m_role;
     bool m_blockFinishedSignal;
-    int m_eventHandlingLevel;
-    bool m_deleteAfterEventHandling;
 };
 
 #endif
diff -Nru kde-baseapps-4.9.4/dolphin/src/main.cpp kde-baseapps-4.9.5/dolphin/src/main.cpp
--- kde-baseapps-4.9.4/dolphin/src/main.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/main.cpp	2012-12-27 17:55:28.244824254 +0000
@@ -82,11 +82,13 @@
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    DolphinApplication app;
-    if (app.isSessionRestored()) {
-        app.restoreSession();
+    {
+        DolphinApplication app;
+        if (app.isSessionRestored()) {
+            app.restoreSession();
+        }
+        app.exec(); // krazy:exclude=crashy
     }
-    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }
diff -Nru kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphingeneral.desktop kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphingeneral.desktop
--- kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphingeneral.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphingeneral.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -293,6 +293,7 @@
 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ů
@@ -304,6 +305,7 @@
 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 -Nru kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop
--- kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -293,6 +293,7 @@
 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ů
@@ -304,6 +305,7 @@
 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 -Nru kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinservices.desktop kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinservices.desktop
--- kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinservices.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinservices.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -244,6 +244,7 @@
 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ů
@@ -255,6 +256,7 @@
 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 -Nru kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop
--- kde-baseapps-4.9.4/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -291,6 +291,7 @@
 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ů
@@ -302,6 +303,7 @@
 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 -Nru kde-baseapps-4.9.4/dolphin/src/views/dolphinview.cpp kde-baseapps-4.9.5/dolphin/src/views/dolphinview.cpp
--- kde-baseapps-4.9.4/dolphin/src/views/dolphinview.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/views/dolphinview.cpp	2012-12-27 17:55:28.244824254 +0000
@@ -342,10 +342,12 @@
 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));
@@ -1227,11 +1229,14 @@
 
         QSet<int> selectedItems = selectionManager->selectedItems();
 
-        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
+        QList<KUrl>::iterator it = m_selectedUrls.begin();
+        while (it != m_selectedUrls.end()) {
             const int index = m_model->index(*it);
             if (index >= 0) {
                 selectedItems.insert(index);
-                m_selectedUrls.erase(it);
+                it = m_selectedUrls.erase(it);
+            } else {
+                 ++it;
             }
         }
 
diff -Nru kde-baseapps-4.9.4/dolphin/src/views/renamedialog.cpp kde-baseapps-4.9.5/dolphin/src/views/renamedialog.cpp
--- kde-baseapps-4.9.4/dolphin/src/views/renamedialog.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/views/renamedialog.cpp	2012-12-27 17:55:28.244824254 +0000
@@ -162,11 +162,6 @@
 
 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) {
diff -Nru kde-baseapps-4.9.4/dolphin/src/views/versioncontrol/fileviewversioncontrolplugin.desktop kde-baseapps-4.9.5/dolphin/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
--- kde-baseapps-4.9.4/dolphin/src/views/versioncontrol/fileviewversioncontrolplugin.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/dolphin/src/views/versioncontrol/fileviewversioncontrolplugin.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -22,6 +22,7 @@
 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
diff -Nru kde-baseapps-4.9.4/kdepasswd/kcm/kcm_useraccount.desktop kde-baseapps-4.9.5/kdepasswd/kcm/kcm_useraccount.desktop
--- kde-baseapps-4.9.4/kdepasswd/kcm/kcm_useraccount.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/kdepasswd/kcm/kcm_useraccount.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -103,6 +103,7 @@
 Name[zh_CN]=密码和用户信息
 Name[zh_TW]=密碼與帳號資訊
 X-KDE-Keywords=password;email;name;organization;realname;login image;face; echo mode;
+X-KDE-Keywords[bs]=password;email;name;organization;realname;login image;face; echo mode;
 X-KDE-Keywords[ca]=contrasenya;correu electrònic;nom;organització;nom real;imatge d'inici de sessió;cara;mode d'eco;
 X-KDE-Keywords[ca@valencia]=contrasenya;correu electrònic;nom;organització;nom real;imatge d'inici de sessió;cara;mode d'eco;
 X-KDE-Keywords[da]=adgangskode;email;navn;organisation;ægtenavn;login-billede;ansigt;ekko-tilstand;
@@ -113,6 +114,7 @@
 X-KDE-Keywords[fi]=salasana;email;sähköposti;nimi;organisaatio;järjestö;oikea nimi;todellinen nimi;tunnuskuva;kaiutustila;salasanakenttä;
 X-KDE-Keywords[fr]=mot de passe ; courriel ; nom ; organisation ; nom réel ; image de connexion ; visage ; mode rappel ; 
 X-KDE-Keywords[ga]=focal faire;ríomhphost;ainm;eagras;fíorainm;íomhá logála isteach;aghaidh;mód macalla;
+X-KDE-Keywords[gl]=contrasinal;correo electrónico;email;organización;nome real;cara;
 X-KDE-Keywords[hu]=jelszó;e-mail;név;szervezet;valódi név;bejelentkezési kép;arckép;visszajelzési mód;
 X-KDE-Keywords[ia]=contrasigno;e-posta;nomine;organization;ver nomine;image de accesso;facie;modo echo;
 X-KDE-Keywords[it]=password;email;posta elettronica;nome;organizzazione;nome vero;immagine di login;face;modalità echo
diff -Nru kde-baseapps-4.9.4/keditbookmarks/keditbookmarks.desktop kde-baseapps-4.9.5/keditbookmarks/keditbookmarks.desktop
--- kde-baseapps-4.9.4/keditbookmarks/keditbookmarks.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/keditbookmarks/keditbookmarks.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -22,6 +22,7 @@
 Name[fi]=Kirjanmerkkimuokkain
 Name[fr]=Éditeur de signets
 Name[ga]=Eagarthóir Leabharmharcanna
+Name[gl]=Editor de marcadores
 Name[gu]=બુકમાર્ક સંપાદક
 Name[he]=עורך הסימניות
 Name[hi]=पसंदीदा संपादक
@@ -85,6 +86,7 @@
 Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä
 Comment[fr]=Éditeur et organisateur de signets
 Comment[ga]=Eagarthóir agus Eagraí Leabharmharcanna
+Comment[gl]=Organizador e editor dos marcadores
 Comment[gu]=બૂકમાર્ક વ્યવસ્થાપક અને સંપાદક
 Comment[he]=מארגן ועורך סימניות
 Comment[hi]=पसंदीदा व्यवस्था और संपादक
diff -Nru kde-baseapps-4.9.4/konq-plugins/kttsplugin/khtmlkttsd.desktop kde-baseapps-4.9.5/konq-plugins/kttsplugin/khtmlkttsd.desktop
--- kde-baseapps-4.9.4/konq-plugins/kttsplugin/khtmlkttsd.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konq-plugins/kttsplugin/khtmlkttsd.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -24,7 +24,7 @@
 Name[bs]=Tekst‑u‑govor
 Name[ca]=Text a veu
 Name[ca@valencia]=Text a veu
-Name[cs]=Text na řeč
+Name[cs]=Hlasová syntéza
 Name[csb]=Czëtôrz tekstu
 Name[da]=Tekst-til-tale
 Name[de]=Sprachausgabe
diff -Nru kde-baseapps-4.9.4/konqueror/preloader/konqy_preloader.desktop kde-baseapps-4.9.5/konqueror/preloader/konqy_preloader.desktop
--- kde-baseapps-4.9.4/konqueror/preloader/konqy_preloader.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/preloader/konqy_preloader.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -19,6 +19,7 @@
 Name[fi]=Konqueror-selaimen esilataaja
 Name[fr]=Module de préchargement du navigateur Konqueror
 Name[ga]=Réamhluchtóir Bhrabhsálaí Konqueror
+Name[gl]=O precargador do navegador Konqueror
 Name[gu]=કોન્કરર બ્રાઉઝર પૂર્વલાવવું
 Name[he]=טעינה מקדימה של Konqueror
 Name[hi]=कॉन्क्वेरर ब्राउसर प्रीलोडर
diff -Nru kde-baseapps-4.9.4/konqueror/settings/ebrowsing/ebrowsing.desktop kde-baseapps-4.9.5/konqueror/settings/ebrowsing/ebrowsing.desktop
--- kde-baseapps-4.9.4/konqueror/settings/ebrowsing/ebrowsing.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/ebrowsing/ebrowsing.desktop	2012-12-27 17:55:28.244824254 +0000
@@ -196,6 +196,7 @@
 Comment[zh_TW]=設定增強式瀏覽
 
 X-KDE-Keywords=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts
+X-KDE-Keywords[bs]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts
 X-KDE-Keywords[ca]=Navegació millorada,navegació,WWW,Internet,Filtres d'Internet,Xarxa,Motors de cerca,Dreceres
 X-KDE-Keywords[ca@valencia]=Navegació millorada,navegació,WWW,Internet,Filtres d'Internet,Xarxa,Motors de cerca,Dreceres
 X-KDE-Keywords[da]=Forbedret browsing,browsing,www,internet,internetfiltre,netværk,søgemaskiner,genveje
@@ -206,6 +207,7 @@
 X-KDE-Keywords[fi]=selaimen lisäasetukset,edistynyt selailu,selailu,selaus,WWW,Internet,Internet-suodattimet,verkko,hakukoneet,pikavalinnat
 X-KDE-Keywords[fr]=Navigation avancée,Navigation,WWW,Internet,Filtres Internet,Réseau,Moteur de recherche,Raccourcis
 X-KDE-Keywords[ga]=Brabhsáil Fheabhsaithe,Brabhsáil,WWW,Gréasán,Idirlíon,Scagairí Idirlín,Líonra,Innill Chuardaigh,Aicearraí
+X-KDE-Keywords[gl]=Navegación mellorada,navegar,www.internet,filtros de internet,rede, motores de busca,atallos
 X-KDE-Keywords[hu]=Fejlesztett böngészés,Böngészés,WWW,Internet,Internetes szűrők,Hálózat,Keresőmotorok,Gyorsbillentyűk
 X-KDE-Keywords[ia]=Navigation avantiate, Navigation,WWW,Internet,Filtros de Internet,Rete, Motores de cerca,Vias breve
 X-KDE-Keywords[it]=Navigazione avanzata,navigazione,WWW,Internet,filtri Internet,rete,motori di ricerca,scorciatoie
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/bookmarks.desktop kde-baseapps-4.9.5/konqueror/settings/kio/bookmarks.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/bookmarks.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/bookmarks.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -182,6 +182,7 @@
 Comment[zh_TW]=設定書籤首頁
 X-KDE-Keywords=Bookmarks
 X-KDE-Keywords[ar]=العلامات
+X-KDE-Keywords[bs]=Zabilješke
 X-KDE-Keywords[ca]=Adreces d'interès
 X-KDE-Keywords[ca@valencia]=Adreces d'interés
 X-KDE-Keywords[cs]=Záložky
@@ -193,6 +194,7 @@
 X-KDE-Keywords[fi]=Kirjanmerkit
 X-KDE-Keywords[fr]=Signets
 X-KDE-Keywords[ga]=Leabharmharcanna
+X-KDE-Keywords[gl]=Marcadores
 X-KDE-Keywords[hu]=Könyvjelzők
 X-KDE-Keywords[ia]=Marcatores de libro
 X-KDE-Keywords[it]=Segnalibri
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/cache.desktop kde-baseapps-4.9.5/konqueror/settings/kio/cache.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/cache.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/cache.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -197,6 +197,7 @@
 Comment[zh_TW]=設定網頁快取設定
 
 X-KDE-Keywords=Cache,History,Browsing History,Ports,Size
+X-KDE-Keywords[bs]=Cache,History,Browsing History,Ports,Size
 X-KDE-Keywords[ca]=Memòria cau,Historial,Historial del navegador,Ports,Mida
 X-KDE-Keywords[ca@valencia]=Memòria cau,Historial,Historial del navegador,Ports,Mida
 X-KDE-Keywords[da]=Cache,historik,browserhistorik,porte,størrelse
@@ -207,6 +208,7 @@
 X-KDE-Keywords[fi]=Välimuisti,Historia,Selaushistoria,Portit,Koko
 X-KDE-Keywords[fr]=Cache,Historique,Historique de navigation,Ports,Taille
 X-KDE-Keywords[ga]=Taisce,Stair,Stair Brabhsála,Poirt,Méid
+X-KDE-Keywords[gl]=Caché,historial,historial de navegación,portos,tamaño
 X-KDE-Keywords[hu]=Gyorsítótár,Előzmények,Böngészési előzmények,Portok,Méret
 X-KDE-Keywords[ia]=Cache,Historia,Historia de navigation,Portos,Grandor
 X-KDE-Keywords[it]=Cache,cronologia,cronologia di navigazione,porte,dimensione
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/cookies.desktop kde-baseapps-4.9.5/konqueror/settings/kio/cookies.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/cookies.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/cookies.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -193,6 +193,7 @@
 Comment[zh_TW]=設定 cookies 運作方式
 
 X-KDE-Keywords=Cookies,Browsing,Internet,WWW,Network,Policy,Domains
+X-KDE-Keywords[bs]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains
 X-KDE-Keywords[ca]=Galetes,Navegació,Internet,WWW,Xarxa,Polítiques,Dominis
 X-KDE-Keywords[ca@valencia]=Galetes,Navegació,Internet,WWW,Xarxa,Polítiques,Dominis
 X-KDE-Keywords[da]=Cookies,browsing,internet,www,netværk,politik,domæner
@@ -203,6 +204,7 @@
 X-KDE-Keywords[fi]=Evästeet,Selaus,Selailu,Internet,WWW,Verkko,Käytäntö,Käytänne,Verkkoalueet
 X-KDE-Keywords[fr]=Cookies,Navigation,Internet,WWW,Réseau,Politique,Domaines
 X-KDE-Keywords[ga]=Fianáin,Brabhsáil,Idirlíon,WWW,Gréasán,Líonra,Polasaí,Fearainn
+X-KDE-Keywords[gl]=cookies,navegar,internet,www,rede,política,dominios
 X-KDE-Keywords[hu]=Sütik,Böngészés,Internet,WWW,Hálózat,Házirend,Tartományok
 X-KDE-Keywords[ia]=Cookies,Navigation,Internet,WWW,Rete,Politica,Dominios
 X-KDE-Keywords[it]=Cookie,navigazione,Internet,WWW,rete,politica,domini
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/netpref.desktop kde-baseapps-4.9.5/konqueror/settings/kio/netpref.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/netpref.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/netpref.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -195,6 +195,7 @@
 Comment[zh_TW]=設定一般網路喜好設定，例如逾時值
 
 X-KDE-Keywords=timeout,iopref,netpref,network preferences,ftp
+X-KDE-Keywords[bs]=timeout,iopref,netpref,network preferences,ftp
 X-KDE-Keywords[ca]=temps d'espera,iopref,netpref,preferències de xarxa,ftp
 X-KDE-Keywords[ca@valencia]=temps d'espera,iopref,netpref,preferències de xarxa,ftp
 X-KDE-Keywords[da]=tidsudløb,timeout,iopref,netpref,netværksindstillinger,ftp
@@ -205,6 +206,7 @@
 X-KDE-Keywords[fi]=aikakatkaisu,iopref,netpref,verkkoasetukset,ftp
 X-KDE-Keywords[fr]=délai dépassé, iopref, netpref, paramètres réseau, ftp
 X-KDE-Keywords[ga]=timeout,iopref,netpref,sainroghanna líonra,ftp
+X-KDE-Keywords[gl]=tempo límite,iopref,netpref,rede,preferencias,ftp
 X-KDE-Keywords[hu]=időtúllépés,iopref,netpref,hálózati beállítások,ftp
 X-KDE-Keywords[ia]=expiration,iopref,prefderete,rete,preferentias,ftp
 X-KDE-Keywords[it]=scadenza,iopref,netpref,preference di rete,ftp
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/proxy.desktop kde-baseapps-4.9.5/konqueror/settings/kio/proxy.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/proxy.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/proxy.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -200,6 +200,7 @@
 Comment[zh_TW]=設定使用的代理伺服器
 
 X-KDE-Keywords=Proxy,Proxy server,Firewall,Squid
+X-KDE-Keywords[bs]=Proxy,Proxy server,Firewall,Squid
 X-KDE-Keywords[ca]=Intermediari,Servidor intermediari,Tallafocs,Squid
 X-KDE-Keywords[da]=Proxy,Proxy-server,Firewall,Squid
 X-KDE-Keywords[de]=Proxy,Proxy-Server,Firewall,Squid
@@ -209,6 +210,7 @@
 X-KDE-Keywords[fi]=Proxy,Välitys,Välityspalvelin,Firewall,Palomuuri,Squid
 X-KDE-Keywords[fr]=Serveur mandataire, serveur (proxy), pare-feu, squid
 X-KDE-Keywords[ga]=Seachfhreastalaí,Balla Dóiteáin,Squid
+X-KDE-Keywords[gl]=Proxy,servidor proxy,devasa,Squid
 X-KDE-Keywords[hu]=Proxy,Proxy kiszolgáló,Tűzfal,Squid
 X-KDE-Keywords[ia]=Proxy,Servitor de Proxy,Talia Foco,Squid
 X-KDE-Keywords[it]=Proxy,Server proxy server,Firewall,Squid
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/smb.desktop kde-baseapps-4.9.5/konqueror/settings/kio/smb.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/smb.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/smb.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -192,6 +192,7 @@
 Comment[zh_TW]=設定您可以瀏覽的 Windows (SMB) 檔案系統
 
 X-KDE-Keywords=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords
+X-KDE-Keywords[bs]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords
 X-KDE-Keywords[ca]=SMB,SAMBA,Client SMB,Xarxa Windows,LAN,Xarxa,veïnat,Servidor,Difusió,WINS,Compartició,Connexió,Contrasenyes
 X-KDE-Keywords[ca@valencia]=SMB,SAMBA,Client SMB client,Xarxa Windows,LAN,Xarxa,veïnat,Servidor,Difusió,WINS,Compartició,Connexió,Contrasenyes
 X-KDE-Keywords[da]=SMB,SAMBA,SMB-klient,Windows netværk,LAN,netværk,nabolag,Server,Broadcast,WINS,Share,Login,adgangskoder
@@ -202,6 +203,7 @@
 X-KDE-Keywords[fi]=SMB,SAMBA,SMB client,SMB-asiakas,SMB-ohjelma,Windows-verkko,LAN,Verkko,ympäristö,Palvelin,Broadcast,Yleislähetys,WINS,Jako,Kirjautuminen,Salasanat
 X-KDE-Keywords[fr]=SMB,SAMBA,client SMB,réseau Windows,LAN,Réseau,voisinage,Serveur,Diffusion,WINS,Partages,Connexion,Mots de passe
 X-KDE-Keywords[ga]=SMB,SAMBA,cliant SMB,líonra Windows,LAN,Líonra,comharsanacht,Freastalaí,Craoladh,WINS,Comhroinn,Logáil Isteach,Focail Fhaire
+X-KDE-Keywords[gl]=SMB,SAMBA,cliente SMB,rede de windows,LAN,rede,veciñanza,servidor, retransmisión,WINS,compartición,compartir,acceso,contrasinais
 X-KDE-Keywords[hu]=SMB,SAMBA,SMB kliens,Windows hálózat,LAN,Hálózat,szomszéd,Kiszolgáló,Broadcast,WINS,Megosztás,Bejelentkezés,Jelszavak
 X-KDE-Keywords[ia]=SMB,SAMBA,Cliente SMB,rete de Windows,LAN,rete,vicinitate,Servitor,Transmission,WINS,Compartite,Authentication,Contrasignos
 X-KDE-Keywords[it]=SMB,SAMBA,client SMB,rete di Windows,LAN,Rete,vicinanza,Server,Broadcast,WINS,Share,Login,Password
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -18,6 +18,7 @@
 Name[fi]=Käyttäjäagenttikuvaus (Google Chrome 5.0)
 Name[fr]=UADescription (Google Chrome 5.0)
 Name[ga]=UADescription (Google Chrome 5.0)
+Name[gl]=UADescription (Google Chrome 5.0)
 Name[gu]=UADescription (ગુગલ ક્રોમ ૫.૦)
 Name[he]=UADescription (Google Chrome 5.0)
 Name[hi]=यूए-डिस्क्रिप्शन (गूगल क्रोम 5.0्सपी पर)
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -18,6 +18,7 @@
 Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.6 nykyisellä)
 Name[fr]=UADescription (Firefox 3.6 sous le système actuel)
 Name[ga]=UADescription (Firefox 3.6 ar an gcóras reatha)
+Name[gl]=UADescription (Firefox 3.6 no actual)
 Name[gu]=UADescription (ફાયરફોક્સ ૩.૬ હાલમાં)
 Name[he]=UADescription (Firefox 3.6 on current)
 Name[hi]=यूए-डिस्क्रिप्शन (फ़ॉयरफ़ॉक्स 3.6 हालिया पर)
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/safari40.desktop kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/safari40.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/uasproviders/safari40.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/uasproviders/safari40.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -18,6 +18,7 @@
 Name[fi]=Käyttäjäagenttikuvaus (Safari 4.0 MacOS X:llä)
 Name[fr]=UADescription (Safari 4.0 sous MacOS X)
 Name[ga]=UADescription (Safari 4.0 ar MacOS X)
+Name[gl]=UADescription (Safari 4.0 en MacOS X)
 Name[gu]=UADescription (સફારી ૪.૦ મેકOS X પર)
 Name[he]=UADescription (Safari 4.0 on MacOS X)
 Name[hi]=यूए-डिस्क्रिप्शन (मॅक-ओएस X में सफारी 2.0)
diff -Nru kde-baseapps-4.9.4/konqueror/settings/kio/useragent.desktop kde-baseapps-4.9.5/konqueror/settings/kio/useragent.desktop
--- kde-baseapps-4.9.4/konqueror/settings/kio/useragent.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/kio/useragent.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -191,6 +191,7 @@
 Comment[zh_TW]=設定 Konqueror 回報自身狀況的方式
 
 X-KDE-Keywords=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login
+X-KDE-Keywords[bs]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login
 X-KDE-Keywords[ca]=Agent d'usuari,Navagador,Internet,WWW,Xarxa,agent,lligams,servidor,connexió
 X-KDE-Keywords[ca@valencia]=Agent d'usuari,Navagador,Internet,WWW,Xarxa,agent,lligams,servidor,connexió
 X-KDE-Keywords[da]=User agent,brugeragent,internet,www,netværk,agent,bindinger,server,login
@@ -201,6 +202,7 @@
 X-KDE-Keywords[fi]=User Agent,Selaimen tunnistetiedot,Selaimen tunnistus,Selain,Internet,WWW,Verkko,agent,palvelin,kirjautuminen
 X-KDE-Keywords[fr]=Agent utilisateur, Navigateur, Internet, www, réseau, agent, liens, serveur,connexion
 X-KDE-Keywords[ga]=UserAgent,gníomhaire úsáideora,Brabhsálaí,Idirlíon,WWW,Líonra,Gréasán,gníomhaire,ceangail,freastalaí,logáil isteach
+X-KDE-Keywords[gl]=Programa cliente,navegador,internet,www,rede,axente,cliente,asociacións,servidor,acceso
 X-KDE-Keywords[hu]=Böngészőazonosító,Böngésző,Internet,WWW,Hálózat,azonosító,kötések,kiszolgáló,bejelentkezés
 X-KDE-Keywords[ia]=Agente usator,Navigator,Internet,WWW,Rete.agente,ligamines,servitor,authentication
 X-KDE-Keywords[it]=Identificazione del browser,browser,Internet,WWW,rete,agente,binding,server,login
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konq/fileappearance.desktop kde-baseapps-4.9.5/konqueror/settings/konq/fileappearance.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konq/fileappearance.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konq/fileappearance.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -196,6 +196,7 @@
 Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的外觀
 
 X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
+X-KDE-Keywords[bs]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
 X-KDE-Keywords[ca]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color,color
 X-KDE-Keywords[ca@valencia]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color
 X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understregning,visning,filstørrelse,bytes,font,skrifttype,farve
@@ -206,6 +207,7 @@
 X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri
 X-KDE-Keywords[fr]=Konqueror, gestionnaire de fichiers, passage à la ligne, sauter, souligner, afficher, taille de fichier, octets, police, couleur, couleur
 X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,timfhilleadh focal,timfhilleadh,líne faoi,scáileán,méid comhaid,bearta,cló,clófhoireann,dath
+X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,axuste,salto de palabra,subraiado,pantalla,tamaño do ficheiro,bytes,letra,cor,fonte
 X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,megjelenítés,fájlméret,bájtok,betűtípus,szín,szín
 X-KDE-Keywords[ia]=konqueror,gerente de file, torno de parolas, torno,sublinea,monstra,grandor de file,bytes,font,color,color
 X-KDE-Keywords[it]=konqueror,gestore dei file,a capo automatico,sottolinea,mostra,dimensione dei file,byte,carattere,colore
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konq/filebehavior.desktop kde-baseapps-4.9.5/konqueror/settings/konq/filebehavior.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konq/filebehavior.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konq/filebehavior.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -196,6 +196,7 @@
 Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的行為
 
 X-KDE-Keywords=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation
+X-KDE-Keywords[bs]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation
 X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial,operacions de xarxa,diàleg de progrés,paperera,esborrat,confirmació
 X-KDE-Keywords[ca@valencia]=konqueror,gestor de fitxers,kfm,consells,consells de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial,operacions de xarxa,diàleg de progrés,paperera,esborrat,confirmació
 X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tips,filtips,separat vindue,affød vinduer,opførsel,hukommelsesforbrug,startside,netværksoperationer,fremgangsdialog,affald kan,slette,bekræftelse
@@ -206,6 +207,7 @@
 X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,omat ikkunat,erilliset ikkunat,toiminta,muistinkäyttö,kotiosoite,verkkotoiminnot,edistymisikkuna,roskakori,poista,varmistus,varmista
 X-KDE-Keywords[fr]=konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtre, comportement, comportement, utilisation de la mémoire, Adresse d'accueil, opérations réseaux, boîte de dialogue de progression, corbeille, effacer, confirmation
 X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,kfm,leideanna,leideanna comhaid,fuinneog ar leith,sceith fuinneoga,oibriú,úsáid chuimhne,URL Baile,oibríochtaí líonra,dialóg dul chun cinn,bruscar,scrios,deimhniú,dearbhú
+X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,kfm,consello,axudiña,xanela separada,comportamento, uso da memoria,URL de inicio,operacións de rede,diálogo de progreso,lixo,borrar, confirmación
 X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablak létrehozása,működés,működés,memóriahasználat,kezdőlap,hálózati műveletek,folyamatablak,kuka,törlés,megerősítés
 X-KDE-Keywords[ia]=konqueror,gerente de file,kfm,suggestiones,fenestra separate,fenestras generate,comportamento,comportamento,uso de memoria.URL domo,operationes de rete,dialogo de progression. corbe,dele,confirmation
 X-KDE-Keywords[it]=konqueror,gestore dei file,kfm,suggerimenti,suggerimenti dei file,finestra separata,apri finestre,comportamento,uso della memoria,indirizzo home,operazioni di rete,finestra di dialogo avanzamento,cestino,annulla,conferma
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konq/webappearance.desktop kde-baseapps-4.9.5/konqueror/settings/konq/webappearance.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konq/webappearance.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konq/webappearance.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -197,6 +197,7 @@
 Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的外觀
 
 X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
+X-KDE-Keywords[bs]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
 X-KDE-Keywords[ca]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color,color
 X-KDE-Keywords[ca@valencia]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color
 X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understregning,visning,filstørrelse,bytes,font,skrifttype,farve
@@ -207,6 +208,7 @@
 X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri
 X-KDE-Keywords[fr]=Konqueror, gestionnaire de fichiers, passage à la ligne, sauter, souligner, afficher, taille de fichier, octets, police, couleur, couleur
 X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,timfhilleadh focal,timfhilleadh,líne faoi,scáileán,méid comhaid,bearta,cló,clófhoireann,dath
+X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,axuste,salto de palabra,subraiado,pantalla,tamaño do ficheiro,bytes,letra,cor,fonte
 X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,megjelenítés,fájlméret,bájtok,betűtípus,szín,szín
 X-KDE-Keywords[ia]=konqueror,gerente de file, torno de parolas, torno,sublinea,monstra,grandor de file,bytes,font,color,color
 X-KDE-Keywords[it]=konqueror,gestore dei file,a capo automatico,sottolinea,mostra,dimensione dei file,byte,carattere,colore
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konq/webbehavior.desktop kde-baseapps-4.9.5/konqueror/settings/konq/webbehavior.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konq/webbehavior.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konq/webbehavior.desktop	2012-12-27 17:55:28.248824204 +0000
@@ -197,6 +197,7 @@
 Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的行為
 
 X-KDE-Keywords=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,
+X-KDE-Keywords[bs]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,
 X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells de fitxer,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial
 X-KDE-Keywords[ca@valencia]=konqueror,gestor de fitxers,kfm,consells,consells de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial
 X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tips,filtips,separat vindue,affød vinduer,opførsel,hukommelsesforbrug,startside,
@@ -207,6 +208,7 @@
 X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,omat ikkunat,erilliset ikkunat,toiminta,muistinkäyttö,kotiosoite,
 X-KDE-Keywords[fr]=Konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtres, comportement, comportement, utilisation de la mémoire, Adresse d'accueil,
 X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,kfm,leideanna,leideanna comhaid,fuinneog ar leith,sceith fuinneoga,oibriú,úsáid chuimhne,URL Baile,
+X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,kfm,consello,axudiña,xanela separada,comportamento, uso da memoria,URL de inicio,
 X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablak létrehozása,működés,működés,memóriahasználat,kezdőlap,
 X-KDE-Keywords[ia]=konqueror,gerente de file,kfm,suggestiones,fenestra separate,fenestras generate,comportamento,comportamento,uso de memoria,URL Domo
 X-KDE-Keywords[it]=konqueror,gestore dei file,kfm,suggerimenti,suggerimenti dei file,finestra separata,apri finestre,comportamento,uso della memoria,indirizzo home,
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konqhtml/css/kcmcss.desktop kde-baseapps-4.9.5/konqueror/settings/konqhtml/css/kcmcss.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konqhtml/css/kcmcss.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konqhtml/css/kcmcss.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -195,6 +195,7 @@
 Comment[zh_TW]=設定用來顯示網頁的樣式表單
 
 X-KDE-Keywords=CSS,HTML,style,stylesheet,accessibility
+X-KDE-Keywords[bs]=CSS,HTML,style,stylesheet,accessibility
 X-KDE-Keywords[ca]=CSS,HTML,estil,fulles d'estil,accessibilitat
 X-KDE-Keywords[ca@valencia]=CSS,HTML,estil,fulles d'estil,accessibilitat
 X-KDE-Keywords[da]=CSS,HTML,stil,stylesheet,stilark,tilgængelighed,accessibility
@@ -205,6 +206,7 @@
 X-KDE-Keywords[fi]=CSS,HTML,style,tyyli,stylesheet,tyylisivu,esteettömyys
 X-KDE-Keywords[fr]=CSS,HTML,style,feuille de style,accessibilité
 X-KDE-Keywords[ga]=CSS,HTML,stíl,stílbhileog,inrochtaineacht
+X-KDE-Keywords[gl]=CSS,HTML,estilo,folla de estilos,accesibilidade
 X-KDE-Keywords[hu]=CSS,HTML,stílus,stíluslap,akadálymentesítés
 X-KDE-Keywords[ia]=CSS,HTML,stilo,folio de stilo,accessibilitate
 X-KDE-Keywords[it]=CSS,HTML,stile,foglio di stile,accessibilità
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_appearance.desktop kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_appearance.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_appearance.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_appearance.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -176,6 +176,7 @@
 Comment[zh_CN]=配置如何显示网页
 Comment[zh_TW]=設定如何顯示網頁
 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding
+X-KDE-Keywords[bs]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding
 X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,joc de caràcters,jocs de caràcters,codificació
 X-KDE-Keywords[ca@valencia]=konqueror,kfm,navegador,html,web,www,tipus de lletres,joc de caràcters,jocs de caràcters,codificació
 X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,tegnsæt,indkodning
@@ -186,6 +187,7 @@
 X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,merkistöt,merkistö,koodaus
 X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,table de caractères,tables de caractères,encodage
 X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clónna,clófhoirne,tacair charachtair,ionchódú
+X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,tipos de letra,conxunto de caracteres,codificación,caracter
 X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,karakterkészletek,karakterkészletek,kódolás
 X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,fonts,insimul de chars,insimules de character,codification
 X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,codifica,insiemi di caratteri
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_behavior.desktop kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_behavior.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_behavior.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_behavior.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -193,6 +193,7 @@
 Comment[zh_CN]=配置浏览器行为
 Comment[zh_TW]=設定瀏覽器行為
 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding
+X-KDE-Keywords[bs]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding
 X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,colors,colors,java,javascript,cursor,enllaços,imatges,joc de caràcters,joc de caràcters,codificació
 X-KDE-Keywords[ca@valencia]=konqueror,kfm,navegador,html,web,www,tipus de lletres,colors,java,javascript,cursor,enllaços,imatges,joc de caràcters,joc de caràcters,codificació
 X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,skrifttyper,farver,java,javascript,cursor,markør,links,billeder,tegnsæt,indkodning
@@ -203,6 +204,7 @@
 X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,värit,java,javascript,osoitin,linkit,kuvat,merkistöt,merkistö,koodaus
 X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,couleurs,java,javascript,curseur,liens,images,table de caractères,tables de caractères,encodage
 X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clófhoirne,clónna,dathanna,java,javascript,cúrsóir,naisc,nascanna,íomhánna,tacair charachtair,ionchódú
+X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,tipos de letra,cores,java,javascript,cursor,ligazóns,imaxes,conxunto de caracteres,codificación,caracter
 X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,színek,színek,java,javascript,kurzor,hivatkozások,képek,karakterkódolások,karakterkódolások,kódolás
 X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,www,fonts,colores,colores,java,javascript,cursor,ligamines,images,insimules de character,insimules de character,codification
 X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,colori,java,javascript,cursore,collegamenti,immagini,codifiche,insiemi di caratteri
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_general.desktop kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_general.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_general.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_general.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -161,6 +161,7 @@
 Comment[zh_CN]=配置 Konqueror 的常规行为
 Comment[zh_TW]=設定 Konqueror 一般行為
 X-KDE-Keywords=konqueror,tabs
+X-KDE-Keywords[bs]=konqueror,tabs
 X-KDE-Keywords[ca]=konqueror,pestanyes
 X-KDE-Keywords[ca@valencia]=konqueror,pestanyes
 X-KDE-Keywords[cs]=konqueror,karty
@@ -172,6 +173,7 @@
 X-KDE-Keywords[fi]=konqueror,välilehdet
 X-KDE-Keywords[fr]=konqueror,onglets
 X-KDE-Keywords[ga]=Konqueror,cluaisíní
+X-KDE-Keywords[gl]=konqueror,lapelas
 X-KDE-Keywords[hu]=konqueror,lapok
 X-KDE-Keywords[ia]=konqueror,schedas
 X-KDE-Keywords[it]=konqueror,schede
diff -Nru kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_java_js.desktop kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_java_js.desktop
--- kde-baseapps-4.9.4/konqueror/settings/konqhtml/khtml_java_js.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/konqhtml/khtml_java_js.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -195,6 +195,7 @@
 Comment[zh_CN]=配置 Java 和 JavaScript 的行为
 Comment[zh_TW]=設定 Java 與 JavaScript 的行為
 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,java,javascript
+X-KDE-Keywords[bs]=konqueror,kfm,browser,html,web,www,java,javascript
 X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,java,javascript
 X-KDE-Keywords[ca@valencia]=konqueror,kfm,navegador,html,web,www,java,javascript
 X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,java,javascript
@@ -205,6 +206,7 @@
 X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,java,javascript
 X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,java,javascript
 X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,java,javascript
+X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,java,javascript
 X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,java,javascript
 X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,java,javascript
 X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,java,javascript
diff -Nru kde-baseapps-4.9.4/konqueror/settings/performance/kcmkonqyperformance.desktop kde-baseapps-4.9.5/konqueror/settings/performance/kcmkonqyperformance.desktop
--- kde-baseapps-4.9.4/konqueror/settings/performance/kcmkonqyperformance.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/performance/kcmkonqyperformance.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -192,6 +192,7 @@
 Comment[zh_TW]=可增進 Konqueror 效能的設定
 
 X-KDE-Keywords=konqueror,reuse,preloading
+X-KDE-Keywords[bs]=konqueror,reuse,preloading
 X-KDE-Keywords[ca]=konqueror,tornar a usar,precàrrega
 X-KDE-Keywords[ca@valencia]=konqueror,tornar a usar,precàrrega
 X-KDE-Keywords[da]=konqueror,genbrug,preloading,forudindlæsning
@@ -202,6 +203,7 @@
 X-KDE-Keywords[fi]=konqueror,uudelleenkäyttö,esilataus
 X-KDE-Keywords[fr]=konqueror,réutiliser,préchargement
 X-KDE-Keywords[ga]=konqueror,athúsáid,réamhluchtú
+X-KDE-Keywords[gl]=konqueror,reutilización,precarga
 X-KDE-Keywords[hu]=konqueror,újrafelhasználás,gyorsbetöltés
 X-KDE-Keywords[ia]=konqueror,reusa,precargante
 X-KDE-Keywords[it]=konqueror,riuso,precaricatore
diff -Nru kde-baseapps-4.9.4/konqueror/settings/performance/kcmperformance.desktop kde-baseapps-4.9.5/konqueror/settings/performance/kcmperformance.desktop
--- kde-baseapps-4.9.4/konqueror/settings/performance/kcmperformance.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/settings/performance/kcmperformance.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -191,6 +191,7 @@
 Comment[zh_TW]=可增進 KDE 效能的設定
 
 X-KDE-Keywords=performance,speed,memory,improve
+X-KDE-Keywords[bs]=performance,speed,memory,improve
 X-KDE-Keywords[ca]=rendiment,velocitat,memòria,millora
 X-KDE-Keywords[ca@valencia]=rendiment,velocitat,memòria,millora
 X-KDE-Keywords[da]=ydelse,hastighed,hukommelse,forbedr
@@ -201,6 +202,7 @@
 X-KDE-Keywords[fi]=suorituskyky,nopeus,muisti,paranna,parannus
 X-KDE-Keywords[fr]=performance,vitesse,mémoire,améliorer
 X-KDE-Keywords[ga]=oibriú,luas,cuimhne,feabhsaigh,feabhsú
+X-KDE-Keywords[gl]=rendemento,velocidade,memoria,mellorar
 X-KDE-Keywords[hu]=teljesítmény,sebesség,memória,fejlesztés
 X-KDE-Keywords[ia]=prestation,velocitate,memoria,meliora
 X-KDE-Keywords[it]=prestazioni,velocità,memoria,migliora
diff -Nru kde-baseapps-4.9.4/konqueror/sidebar/default_entries/places.desktop kde-baseapps-4.9.5/konqueror/sidebar/default_entries/places.desktop
--- kde-baseapps-4.9.4/konqueror/sidebar/default_entries/places.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/sidebar/default_entries/places.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -95,6 +95,7 @@
 Comment[fi]=Tämä on luettelo sijainneista.
 Comment[fr]=Ceci est la liste des emplacements.
 Comment[ga]=Seo é an liosta d'áiteanna.
+Comment[gl]=Esta é a lista de  lugares.
 Comment[gu]=આ જગ્યાઓની યાદી છે
 Comment[he]=זוהי רשימת המקומות.
 Comment[hi]=यह स्थानों की सूची है
diff -Nru kde-baseapps-4.9.4/konqueror/sidebar/history_module/kcmhistory.desktop kde-baseapps-4.9.5/konqueror/sidebar/history_module/kcmhistory.desktop
--- kde-baseapps-4.9.4/konqueror/sidebar/history_module/kcmhistory.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/sidebar/history_module/kcmhistory.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -193,6 +193,7 @@
 Comment[zh_CN]=配置历史侧边栏
 Comment[zh_TW]=設定歷史紀錄邊列
 X-KDE-Keywords=history,expire
+X-KDE-Keywords[bs]=history,expire
 X-KDE-Keywords[ca]=historial,expira
 X-KDE-Keywords[ca@valencia]=historial,venciment
 X-KDE-Keywords[da]=historik,udløb
@@ -203,6 +204,7 @@
 X-KDE-Keywords[fi]=historia,vanhentuminen
 X-KDE-Keywords[fr]=historique,expiration
 X-KDE-Keywords[ga]=stair,caite,as feidhm,téigh as feidhm
+X-KDE-Keywords[gl]=historial,caducar,expirar
 X-KDE-Keywords[hu]=előzmények,lejárat
 X-KDE-Keywords[ia]=historia,expira
 X-KDE-Keywords[it]=cronologia,scadenza
diff -Nru kde-baseapps-4.9.4/konqueror/sidebar/history_module/konqsidebar_history.desktop kde-baseapps-4.9.5/konqueror/sidebar/history_module/konqsidebar_history.desktop
--- kde-baseapps-4.9.4/konqueror/sidebar/history_module/konqsidebar_history.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/sidebar/history_module/konqsidebar_history.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -23,6 +23,7 @@
 Name[fr]=Barre latérale d'historique
 Name[fy]=Skiednis sydbalke module
 Name[ga]=Barra Taoibh Staire
+Name[gl]=Módulo da barra lateral co historial
 Name[gu]=ઇતિહાસ બાજુપટ્ટી મોડ્યુલ
 Name[he]=מודל סרגל היסטוריה
 Name[hi]=इतिहास बाज़ूपट्टी मोड्यूल
diff -Nru kde-baseapps-4.9.4/konqueror/sidebar/konq_sidebartng.desktop kde-baseapps-4.9.5/konqueror/sidebar/konq_sidebartng.desktop
--- kde-baseapps-4.9.4/konqueror/sidebar/konq_sidebartng.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/sidebar/konq_sidebartng.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -23,6 +23,7 @@
 Name[fr]=Barre latérale
 Name[fy]=Sydbalke
 Name[ga]=Barra Taoibh
+Name[gl]=Barra lateral
 Name[gu]=બાજુપટ્ટી
 Name[he]=סרגל צד
 Name[hi]=बाजूपट्टी
diff -Nru kde-baseapps-4.9.4/konqueror/sidebar/places_module/konqsidebar_places.desktop kde-baseapps-4.9.5/konqueror/sidebar/places_module/konqsidebar_places.desktop
--- kde-baseapps-4.9.4/konqueror/sidebar/places_module/konqsidebar_places.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/sidebar/places_module/konqsidebar_places.desktop	2012-12-27 17:55:28.252824154 +0000
@@ -20,6 +20,7 @@
 Name[fi]=Sijainnit sivupalkki-moduuli
 Name[fr]=Barre latérale des emplacements
 Name[ga]=Modúl Barra Taoibh Áiteanna
+Name[gl]=Módulo da barra lateral de lugares
 Name[gu]=જગ્યાઓ બાજુપટ્ટી મોડ્યુલ
 Name[he]=מודול סרגל צד מקומות
 Name[hi]= बाज़ूपट्टी मॉड्यू लगाता हैल
diff -Nru kde-baseapps-4.9.4/konqueror/src/konqmainwindow.cpp kde-baseapps-4.9.5/konqueror/src/konqmainwindow.cpp
--- kde-baseapps-4.9.4/konqueror/src/konqmainwindow.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/konqueror/src/konqmainwindow.cpp	2012-12-27 17:55:28.256824105 +0000
@@ -1827,39 +1827,47 @@
         if (KAuthorized::authorizeControlModule("filebehavior") )
         {
             KPageWidgetItem * fileManagementGroup = m_configureDialog->addModule("filebehavior");
-            fileManagementGroup->setName(i18n("File Management"));
-            const char* const fmModules[]={
-                "kcmdolphinviewmodes",
-                "kcmdolphinnavigation",
-                "kcmdolphinservices",
-                "kcmdolphingeneral",
-                "filetypes",
-                "kcmtrash"};
-            for (uint i=0;i<sizeof(fmModules)/sizeof(char*);++i)
-                if (KAuthorized::authorizeControlModule(fmModules[i]))
-                    m_configureDialog->addModule(KCModuleInfo(QString(fmModules[i])+".desktop"),fileManagementGroup);
+            if (fileManagementGroup) {
+                fileManagementGroup->setName(i18n("File Management"));
+                const char* const fmModules[]={
+                    "kcmdolphinviewmodes",
+                    "kcmdolphinnavigation",
+                    "kcmdolphinservices",
+                    "kcmdolphingeneral",
+                    "filetypes",
+                    "kcmtrash"};
+                for (uint i=0;i<sizeof(fmModules)/sizeof(char*);++i)
+                    if (KAuthorized::authorizeControlModule(fmModules[i]))
+                        m_configureDialog->addModule(KCModuleInfo(QString(fmModules[i])+".desktop"),fileManagementGroup);
+            } else {
+                kWarning() << "Unable to load the \"File Management\" configuration module";
+            }
         }
 
         if (KAuthorized::authorizeControlModule("khtml_behavior"))
         {
             KPageWidgetItem * webGroup = m_configureDialog->addModule("khtml_behavior");
-            webGroup->setName(i18n("Web Browsing"));
+            if (webGroup) {
+                webGroup->setName(i18n("Web Browsing"));
 
-            const char* const webModules[]={
-                "khtml_appearance",
-                "khtml_filter",
-                "ebrowsing",
-                "cache",
-                "proxy",
-                "kcmhistory",
-                "cookies",
-                "crypto",
-                "useragent",
-                "khtml_java_js",
-                "khtml_plugins"};
-            for (uint i=0;i<sizeof(webModules)/sizeof(char*);++i)
-                if (KAuthorized::authorizeControlModule(webModules[i]))
-                    m_configureDialog->addModule(KCModuleInfo(QString(webModules[i])+".desktop"),webGroup);
+                const char* const webModules[]={
+                    "khtml_appearance",
+                    "khtml_filter",
+                    "ebrowsing",
+                    "cache",
+                    "proxy",
+                    "kcmhistory",
+                    "cookies",
+                    "crypto",
+                    "useragent",
+                    "khtml_java_js",
+                    "khtml_plugins"};
+                for (uint i=0;i<sizeof(webModules)/sizeof(char*);++i)
+                    if (KAuthorized::authorizeControlModule(webModules[i]))
+                        m_configureDialog->addModule(KCModuleInfo(QString(webModules[i])+".desktop"),webGroup);
+            } else {
+                kWarning() << "Unable to load the \"Web Browsing\" configuration module";
+            }
 
         }
         //END SYNC with initActions()
diff -Nru kde-baseapps-4.9.4/lib/konq/Templates/Floppy.desktop kde-baseapps-4.9.5/lib/konq/Templates/Floppy.desktop
--- kde-baseapps-4.9.4/lib/konq/Templates/Floppy.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/lib/konq/Templates/Floppy.desktop	2012-12-27 17:55:28.256824105 +0000
@@ -20,6 +20,7 @@
 Name[fi]=Alusta
 Name[fr]=Format
 Name[ga]=Formáidigh
+Name[gl]=Formatar
 Name[gu]=બંધારણ
 Name[he]=פירמוט
 Name[hi]=फॉर्मेट
diff -Nru kde-baseapps-4.9.4/lib/konq/favicons/favicons.desktop kde-baseapps-4.9.5/lib/konq/favicons/favicons.desktop
--- kde-baseapps-4.9.4/lib/konq/favicons/favicons.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/lib/konq/favicons/favicons.desktop	2012-12-27 17:55:28.256824105 +0000
@@ -94,6 +94,7 @@
 Comment[fi]=Säilyttää verkkosivujen kuvakkeita
 Comment[fr]=Stocke les icônes des sites Internet
 Comment[ga]=Stórálann sé deilbhín suíomh Gréasáin
+Comment[gl]=Garda as iconas logotipo dos sitios web
 Comment[gu]=વેબસાઈટના ચિહ્નો સંગ્રહ કરે છે
 Comment[he]=איחסון סמלי אתרים
 Comment[hi]=वेबसाइट प्रतीक सहेजता है
diff -Nru kde-baseapps-4.9.4/nsplugins/khtml_plugins.desktop kde-baseapps-4.9.5/nsplugins/khtml_plugins.desktop
--- kde-baseapps-4.9.4/nsplugins/khtml_plugins.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/nsplugins/khtml_plugins.desktop	2012-12-27 17:55:28.256824105 +0000
@@ -197,6 +197,7 @@
 Comment[zh_CN]=配置浏览器插件
 Comment[zh_TW]=設定瀏覽器外掛程式
 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,plugins
+X-KDE-Keywords[bs]=konqueror,kfm,browser,html,web,www,fonts,plugins
 X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,connectors
 X-KDE-Keywords[ca@valencia]=konqueror,kfm,navegador,html,web,www,tipus de lletres,connectors
 X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,plugins,skrifttyper
@@ -207,6 +208,7 @@
 X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,liitännäiset
 X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,modules externes
 X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,gréasán,clófhoirne,clónna,breiseáin
+X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,complementos
 X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,bővítmények
 X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,www,fonts,plugins
 X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,estensioni
diff -Nru kde-baseapps-4.9.4/plasma/applets/folderview/folderview.cpp kde-baseapps-4.9.5/plasma/applets/folderview/folderview.cpp
--- kde-baseapps-4.9.4/plasma/applets/folderview/folderview.cpp	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/plasma/applets/folderview/folderview.cpp	2012-12-27 17:55:28.256824105 +0000
@@ -631,6 +631,8 @@
 
 FolderView::~FolderView()
 {
+    if (m_dialog)
+        delete m_dialog;
     delete m_newMenu;
 }
 
@@ -1244,7 +1246,6 @@
 
             delete m_iconWidget;
             delete m_dialog;
-            delete m_listView;
             m_iconWidget = 0;
             m_dialog = 0;
             m_listView = 0;
diff -Nru kde-baseapps-4.9.4/plasma/applets/folderview/plasma-applet-folderview.desktop kde-baseapps-4.9.5/plasma/applets/folderview/plasma-applet-folderview.desktop
--- kde-baseapps-4.9.4/plasma/applets/folderview/plasma-applet-folderview.desktop	2012-11-30 07:28:23.000000000 +0000
+++ kde-baseapps-4.9.5/plasma/applets/folderview/plasma-applet-folderview.desktop	2012-12-27 17:55:28.256824105 +0000
@@ -84,6 +84,7 @@
 Comment=Display the contents of folders
 Comment[ar]=اعرض محتوى المجلدات
 Comment[bg]=Показва съдържанието на папки
+Comment[bs]=Prikaži sadržaj direktorija
 Comment[ca]=Mostra el contingut de les carpetes
 Comment[ca@valencia]=Mostra el contingut de les carpetes
 Comment[cs]=Zobrazit obsah složek
@@ -96,6 +97,7 @@
 Comment[fi]=Näyttää kansion sisällön
 Comment[fr]=Afficher les contenus des dossiers
 Comment[ga]=Taispeáin inneachar d'fhillteáin
+Comment[gl]=Mostra o contido dos cartafoles
 Comment[hu]=Megjeleníti a mappák tartalmát
 Comment[ia]=Monstra le contentos de dossieres
 Comment[is]=Sýna innihald mappa