Merge branch 'Applications/17.08'

diff --combined src/dolphinmainwindow.cpp
index 194666be325afeea0a5da7382b3e3d8b55bb0dde,658b89006fef721e7533f92f845bc667c609884b..fe34c306fe55c30c7137ff57152235ee670d35a1
--- 1/src/dolphinmainwindow.cpp
--- 2/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -98,6 -98,8 +98,8 @@@ DolphinMainWindow::DolphinMainWindow() 
      m_updateToolBarTimer(0),
      m_lastHandleUrlStatJob(0)
  {
+     Q_INIT_RESOURCE(dolphin);
+ 
      setObjectName(QStringLiteral("Dolphin#"));
  
      connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
@@@ -1317,7 -1319,7 +1319,7 @@@ void DolphinMainWindow::updateEditActio
  
          KActionCollection* col = actionCollection();
          QAction* renameAction      = col->action(QStringLiteral("rename"));
 -        QAction* moveToTrashAction = col->action(QStringLiteral("move_to_trash"));
 +        QAction* moveToTrashAction = col->action(KStandardAction::name(KStandardAction::MoveToTrash));
          QAction* deleteAction      = col->action(KStandardAction::name(KStandardAction::DeleteFile));
          QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
          QAction* deleteWithTrashShortcut = col->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler