[nautilus] (9 commits) Non-fast-forward update to branch wip/csoriano/zoomsv3

[Carlos Soriano Sánchez <csoriano src gnome org>]

The branch 'wip/csoriano/zoomsv3' 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:

  e2c448b... canvas-item: add dynamic label sizing for zoom levels

Commits added to the branch:

  b2bf952... canvas-item: add dynamic label sizing for zoom levels
  0ea0c73... window: use slot location instead of loading
  5af885e... toolbar: remove unneeded var
  d15a8c8... placesview: avoid symbol conflicts
  569f2f0... window: use open flags for other locations view
  e236752... window: escape notification markup
  97580d5... placesview: update to master
  3d72fbd... file-undo-operations: modularize restoring files from trash
  7148878... file-operations: check that trashed files are actually in t