[nautilus] (7 commits) Non-fast-forward update to branch wip/antoniof/use-cached-templates-menu-model

[Ondrej Holy <oholy src gnome org>]

The branch 'wip/antoniof/use-cached-templates-menu-model' was changed in a way that was not a fast-forward 
update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  c6cd28b... files-view: Clear :templates-menu if it should not be used
  0a90fc4... files-view: Only refresh New Document menu if needed
  2bb8cc6... files-view: Only refresh Scripts menu if needed
  f747f26... files-view: Clean up submenus update code

Commits added to the branch:

  bc3edaa... file-conflict-dialog: Don't change action when unchecking (*)
  42b0362... build: Remove incorrect i18n.merge_file argument (*)
  6afce41... trash-bar: Ellipsize subtitle label (*)
  a520e27... files-view: Clear :templates-menu if it should not be used
  4a44f3d... files-view: Only refresh New Document menu if needed
  2804732... files-view: Only refresh Scripts menu if needed
  4b3f118... files-view: Clean up submenus update code

(*) This commit already existed in another branch; no separate mail sent