Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	examples/mailreader/settings.h
	kmail/kmmainwidget.cpp

data/kmail2.notifyrc

@@ -438,6 +438,7 @@ Name[da]=Arkivering af e-mails i mappe gennemført
 Name[de]=E-Mail-Archivierung im Ordner beendet
 Name[el]=Η αρχειοθέτηση της αλληλογραφίας στο φάκελο ολοκληρώθηκε
 Name[es]=Archivado de correos en carpeta terminado
+Name[et]=Kirjad on kausta arhiveeritud
 Name[fi]=Viestien arkistointi kansioihin valmis
 Name[fr]=Archivage des dossiers terminé
 Name[gl]=Rematou Arquivar o correo
@@ -473,6 +474,7 @@ Name[da]=Fejl ved mappe-arkivering
 Name[de]=Ordner-Archivierungs-Fehler
 Name[el]=Σφάλμα φακέλου αρχειοθέτησης
 Name[es]=Error de archivado de carpeta
+Name[et]=Kirjade arhiveerimise tõrge
 Name[fi]=Kansion arkistointivirhe
 Name[fr]=Erreur d'archivage des dossiers
 Name[gl]=Erro do arquivo de cartafoles

kmmainwidget.cpp

@@ -235,7 +235,8 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
     mVacationIndicatorActive( false ),
     mGoToFirstUnreadMessageInSelectedFolder( false ),
     mDisplayMessageFormatMenu( 0 ),
-    mFolderDisplayFormatPreference(MessageViewer::Viewer::UseGlobalSetting)
+    mFolderDisplayFormatPreference(MessageViewer::Viewer::UseGlobalSetting),
+    mSearchMessages( 0 )
 {
     // must be the first line of the constructor:
     mStartupDone = false;
@@ -3131,12 +3132,11 @@ void KMMainWidget::setupActions()
     connect(mDeleteThreadAction, SIGNAL(triggered(bool)), SLOT(slotDeleteThread()));
     mDeleteThreadAction->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Delete));
 
-    {
-        QAction *action = new QAction(KIcon(QLatin1String("edit-find-mail")), i18n("&Find Messages..."), this);
-        actionCollection()->addAction(QLatin1String("search_messages"), action );
-        connect(action, SIGNAL(triggered(bool)), SLOT(slotRequestFullSearchFromQuickSearch()));
-        action->setShortcut(QKeySequence(Qt::Key_S));
-    }
+    mSearchMessages = new QAction(KIcon(QLatin1String("edit-find-mail")), i18n("&Find Messages..."), this);
+    actionCollection()->addAction(QLatin1String("search_messages"), mSearchMessages );
+    connect(mSearchMessages, SIGNAL(triggered(bool)), SLOT(slotRequestFullSearchFromQuickSearch()));
+    mSearchMessages->setShortcut(QKeySequence(Qt::Key_S));
+
     {
         QAction *action = new QAction(i18n("Select &All Messages"), this);
         actionCollection()->addAction(QLatin1String("mark_all_messages"), action );
@@ -4132,6 +4132,7 @@ void KMMainWidget::updateFolderMenu()
 
     mTrashThreadAction->setText(isInTrashFolder ?i18n("Delete T&hread"): i18n("M&ove Thread to Trash"));
 
+    mSearchMessages->setText( (mCurrentFolder->collection().resource() == QLatin1String( "akonadi_search_resource" )) ? i18n("Edit Search...") : i18n("&Find Messages...") );
 
 
     mExpireConfigAction->setEnabled( mCurrentFolder &&

kmmainwidget.h

@@ -631,6 +631,7 @@ private:
     QAction *mQuickSearchAction;
     DisplayMessageFormatActionMenu *mDisplayMessageFormatMenu;
     MessageViewer::Viewer::DisplayFormatMessage mFolderDisplayFormatPreference;
+    QAction *mSearchMessages;
 };
 
 #endif