Merge branch 'master' into frameworks

8 files changed, 18 insertions, 47 deletions

diff --git a/src/dolphin.appdata.xml b/src/dolphin.appdata.xml
index 2b4975c09..c060edeb4 100644
--- a/src/dolphin.appdata.xml
+++ b/src/dolphin.appdata.xml
@@ -22,6 +22,7 @@
   <name xml:lang="nb">Dolphin</name>
   <name xml:lang="nds">Dolphin</name>
   <name xml:lang="nl">Dolphin</name>
+  <name xml:lang="pa">ਡਾਲਫਿਨ</name>
   <name xml:lang="pl">Dolphin</name>
   <name xml:lang="pt">Dolphin</name>
   <name xml:lang="pt-BR">Dolphin</name>
@@ -56,6 +57,7 @@
   <summary xml:lang="nb">Filbehandler</summary>
   <summary xml:lang="nds">Dateipleger</summary>
   <summary xml:lang="nl">Bestandsbeheerder</summary>
+  <summary xml:lang="pa">ਫਾਇਲ ਮੈਨੇਜਰ</summary>
   <summary xml:lang="pl">Zarządzanie plikami</summary>
   <summary xml:lang="pt">Gestor de Ficheiros</summary>
   <summary xml:lang="pt-BR">Gerenciador de arquivos</summary>
@@ -121,6 +123,7 @@
     <p xml:lang="nb">Egenskaper:</p>
     <p xml:lang="nds">Markmalen:</p>
     <p xml:lang="nl">Mogelijkheden:</p>
+    <p xml:lang="pa">ਲੱਛਣ:</p>
     <p xml:lang="pl">Możliwości:</p>
     <p xml:lang="pt">Características:</p>
     <p xml:lang="pt-BR">Funcionalidades:</p>
@@ -275,6 +278,7 @@
       <li xml:lang="nb">Støtte for flere faner</li>
       <li xml:lang="nds">Ünnerstütten för Paneels</li>
       <li xml:lang="nl">Ondersteuning voor meerdere tabbladen</li>
+      <li xml:lang="pa">ਬਹੁ ਟੈਬ ਸਹਿਯੋਗ</li>
       <li xml:lang="pl">Obsługa wielu kart</li>
       <li xml:lang="pt">Suporte para várias páginas</li>
       <li xml:lang="pt-BR">Suporte a várias abas</li>
@@ -338,6 +342,7 @@
       <li xml:lang="nb">Støtte for angring/omgjøring</li>
       <li xml:lang="nds">Ünnerstütten för Torüchnehmen un Wedderherstellen</li>
       <li xml:lang="nl">Ondersteuning ongedaan maken/opnieuw</li>
+      <li xml:lang="pa">ਵਾਪਿਸ ਕਰੋ/ਪਰਤਾਉਣ ਸਹਿਯੋਗ</li>
       <li xml:lang="pl">Obsługa cofnij/ponów</li>
       <li xml:lang="pt">Suporte para desfazer/refazer</li>
       <li xml:lang="pt-BR">Suporte para desfazer/refazer</li>
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 0f5854656..0a8fe9cb3 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -80,7 +80,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
     m_systemBookmarksIndexes(),
     m_bookmarkedItems(),
     m_hiddenItemToRemove(-1),
-    m_saveBookmarksTimer(0),
     m_updateBookmarksTimer(0),
     m_storageSetupInProgress()
 {
@@ -97,11 +96,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
 
     const int syncBookmarksTimeout = 100;
 
-    m_saveBookmarksTimer = new QTimer(this);
-    m_saveBookmarksTimer->setInterval(syncBookmarksTimeout);
-    m_saveBookmarksTimer->setSingleShot(true);
-    connect(m_saveBookmarksTimer, &QTimer::timeout, this, &PlacesItemModel::saveBookmarks);
-
     m_updateBookmarksTimer = new QTimer(this);
     m_updateBookmarksTimer->setInterval(syncBookmarksTimeout);
     m_updateBookmarksTimer->setSingleShot(true);
@@ -501,8 +495,6 @@ void PlacesItemModel::onItemInserted(int index)
         m_bookmarkedItems.insert(bookmarkIndex, 0);
     }
 
-    triggerBookmarksSaving();
-
 #ifdef PLACESITEMMODEL_DEBUG
     kDebug() << "Inserted item" << index;
     showModelState();
@@ -521,8 +513,6 @@ void PlacesItemModel::onItemRemoved(int index, KStandardItem* removedItem)
     Q_ASSERT(!m_bookmarkedItems[boomarkIndex]);
     m_bookmarkedItems.removeAt(boomarkIndex);
 
-    triggerBookmarksSaving();
-
 #ifdef PLACESITEMMODEL_DEBUG
     kDebug() << "Removed item" << index;
     showModelState();
@@ -552,8 +542,6 @@ void PlacesItemModel::onItemChanged(int index, const QSet<QByteArray>& changedRo
             QTimer::singleShot(0, this, SLOT(hideItem()));
         }
     }
-
-    triggerBookmarksSaving();
 }
 
 void PlacesItemModel::slotDeviceAdded(const QString& udi)
@@ -1035,20 +1023,12 @@ void PlacesItemModel::hideItem(int index)
             // bookmark should still be remembered, so readd it again:
             m_bookmarkManager->root().addBookmark(hiddenBookmark);
             m_bookmarkManager->root().moveBookmark(hiddenBookmark, previousBookmark);
-            triggerBookmarksSaving();
         }
 
         m_bookmarkedItems.insert(newIndex, hiddenItem);
     }
 }
 
-void PlacesItemModel::triggerBookmarksSaving()
-{
-    if (m_saveBookmarksTimer) {
-        m_saveBookmarksTimer->start();
-    }
-}
-
 QString PlacesItemModel::internalMimeType() const
 {
     return "application/x-dolphinplacesmodel-" +
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 38fcfe6af..aa8bb16fe 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -122,6 +122,14 @@ public:
     static QUrl convertedUrl(const QUrl& url);
 
     virtual void clear() Q_DECL_OVERRIDE;
+
+    /**
+     * Saves the bookmarks and indicates to other applications that the
+     * state of the bookmarks has been changed. Is only called by the
+     * timeout of m_saveBookmarksTimer to prevent unnecessary savings.
+     */
+    void saveBookmarks();
+
 signals:
     void errorMessage(const QString& message);
     void storageSetupDone(int index, bool success);
@@ -145,12 +153,6 @@ private slots:
      */
     void updateBookmarks();
 
-    /**
-     * Saves the bookmarks and indicates to other applications that the
-     * state of the bookmarks has been changed. Is only called by the
-     * timeout of m_saveBookmarksTimer to prevent unnecessary savings.
-     */
-    void saveBookmarks();
 private:
     struct SystemBookmarkData;
 
@@ -197,12 +199,6 @@ private:
      */
     void hideItem(int index);
 
-    /**
-     * Triggers a delayed saving of bookmarks by starting
-     * m_saveBookmarksTimer.
-     */
-    void triggerBookmarksSaving();
-
     QString internalMimeType() const;
 
     /**
@@ -285,7 +281,6 @@ private:
     // removing an item is not allowed.
     int m_hiddenItemToRemove;
 
-    QTimer* m_saveBookmarksTimer;
     QTimer* m_updateBookmarksTimer;
 
     QHash<QObject*, int> m_storageSetupInProgress;
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 631b6b69d..5618cee21 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -286,8 +286,10 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
                 editEntry(index);
             } else if (action == removeAction) {
                 m_model->removeItem(index);
+                m_model->saveBookmarks();
             } else if (action == hideAction) {
                 item->setHidden(hideAction->isChecked());
+                m_model->saveBookmarks();
             } else if (action == openInNewTabAction) {
                 // TriggerItem does set up the storage first and then it will
                 // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton.
@@ -402,6 +404,7 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
 void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     m_model->dropMimeDataBefore(index, event->mimeData());
+    m_model->saveBookmarks();
 }
 
 void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)
@@ -463,6 +466,7 @@ void PlacesPanel::addEntry()
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
         m_model->appendItemToGroup(item);
+        m_model->saveBookmarks();
     }
 
     delete dialog;
@@ -484,6 +488,7 @@ void PlacesPanel::editEntry(int index)
             oldItem->setText(dialog->text());
             oldItem->setUrl(dialog->url());
             oldItem->setIcon(dialog->icon());
+            m_model->saveBookmarks();
         }
     }
 
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 6a5927703..02e72da9a 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -111,10 +111,8 @@ Comment[mk]=Овој сервис овозможува конфигурациј�
 Comment[ml]=പൊതുവായ ഡോള്‍ഫിന്‍ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
 Comment[mr]=ही सेवा तुम्हाला डॉल्फिनच्या सामान्य व्यवस्थेचे संयोजन करण्यास मदत करते.
 Comment[ms]=Servis ini membenarkan tetapan bagi tetapan umum Dolphin.
-Comment[nb]=Denne tjenesten tilbyr oppsett av generelle Dolphin-innstillinger.
 Comment[nds]=Mit dissen Deenst laat sik allmeen Dolphin-Optschonen instellen.
 Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
-Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin.
 Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
 Comment[pt]=Este serviço permite-lhe configurar as opções gerais do Dolphin.
@@ -266,17 +264,14 @@ Comment[mk]=Конфигурирајте ги општите поставува�
 Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക
 Comment[mr]=फाईल व्यवस्थापकाच्या सामान्य व्यवस्थेचे संयोजन करा
 Comment[ms]=Selaraskan tetapan pengurus fail
-Comment[nb]=Tilpass generelle filbehandler-innstillinger
 Comment[nds]=Den Dateipleger allmeen instellen
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
-Comment[nn]=Set opp generelle innstillingar for filhandsamaren
 Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as opções gerais do gestor de ficheiros
 Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos
 Comment[ro]=Configurează opțiunile generale ale gestionarul de fișiere
 Comment[ru]=Настройка диспетчера файлов
-Comment[se]=Heivet oppalaš fiilagieđahallanheivehusat
 Comment[si]=සාමාන්‍ය ගොනු කළමාණාකරන සැකසුම් සකසන්න
 Comment[sk]=Všeobecné nastavenie správcu súborov
 Comment[sl]=Splošne nastavitve upravljalnika datotek
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 9c69c691a..4312fb406 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -112,10 +112,8 @@ Comment[mk]=Овој сервис овозможува конфигурациј�
 Comment[ml]=ഡോള്‍ഫിനകത്തു് നീങ്ങുന്നതു് ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
 Comment[mr]=ही सेवा तुम्हाला डॉल्फिन संचारणाचे संयोजन करण्यास मदत करते.
 Comment[ms]=Servis ini membenarkan tetapan bagi pengemudian Dolphin.
-Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin-navigasjon
 Comment[nds]=Mit dissen Deenst lett sik de Dolphin-Navigeren instellen.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
-Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin.
 Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[pt]=Este serviço permite-lhe configurar a navegação do Dolphin.
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 25710e019..cb08a6a60 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -42,10 +42,8 @@ Name[mk]=Сервиси во Делфин
 Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍
 Name[mr]=डॉल्फिन सेवा
 Name[ms]=Servis Dolphin
-Name[nb]=Dolphin-tjenester
 Name[nds]=Dolphin-Deensten
 Name[nl]=Dolphin-services
-Name[nn]=Dolphin-tenester
 Name[pa]=ਡਾਲਫਿਨ ਸਰਵਿਸਾਂ
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
@@ -136,11 +134,9 @@ Name[mk]=Сервиси
 Name[ml]=സേവനങ്ങള്‍
 Name[mr]=सेवा
 Name[ms]=Servis
-Name[nb]=Tjenester
 Name[nds]=KDE-Deensten
 Name[ne]=सेवा
 Name[nl]=Services
-Name[nn]=Tenester
 Name[oc]=Servicis
 Name[or]=ସର୍ଭିସଗୁଡ଼ିକ
 Name[pa]=ਸਰਵਿਸਾਂ
@@ -149,7 +145,6 @@ Name[pt]=Serviços
 Name[pt_BR]=Serviços
 Name[ro]=Servicii
 Name[ru]=Действия
-Name[se]=Bálvalusat
 Name[si]=සේවා
 Name[sk]=Služby
 Name[sl]=Storitve
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 3856fc676..74d2d11c8 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -111,10 +111,8 @@ Comment[mai]=ई सेवा अहाँकेँ डॉल्फिन दृ
 Comment[mk]=Овој сервис овозможува конфигурација на режимите за преглед во Делфин.
 Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
 Comment[mr]=ही सेवा तुम्हाला डॉल्फिन दृश्य पद्धतीचे संयोजन करण्यास मदत करते.
-Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin visningsmåter.
 Comment[nds]=Mit dissen Deenst laat sik de Dolphin-Ansichten instellen.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
-Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingar.
 Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin.