updated Tamil translation
Updated Greek translation
Updated Polish translation
ui-utilities: move nautilus_thumbnail_frame_image() here

So that we can use it also for custom icons.
Also, merge some icon size checks into the function itself.
file: use a frame around custom icons

Make it consistent with the appearance of thumbnails.

https://bugzilla.gnome.org/show_bug.cgi?id=524392
slot: make the NautilusWindow a construct property

Instead of setting it in _new(). This makes code more robust.
Updated Galician translations
floating-bar: ellipsize the filename separately from the details

This patch does three things:
- It adds API to the floating bar to have primary and details labels
  instead of a single label. The primary label is ellipsized separately
  from the details, so it makes a good fit for a filename.
- Modifies the code setting status messages in NautilusView to split
  them into two separate strings
- Removes obsolete code in NautilusView and NautilusWindowSlot that was
  setting long statuses for the old non-floating statusbar

https://bugzilla.gnome.org/show_bug.cgi?id=660695
Updated Polish translation
preferences: remove double label in List Column tab

The label on the tab itself is enough, no need to repeat the heading
again.

https://bugzilla.gnome.org/show_bug.cgi?id=683071
Update directory size in properties when it changes

https://bugzilla.gnome.org/show_bug.cgi?id=342670
list-view: remove context-menu on blank space

https://bugzilla.gnome.org/show_bug.cgi?id=667386
Remove duplicate view items from the background menu

https://bugzilla.gnome.org/show_bug.cgi?id=667386
Add paste and location properties to the gear menu

So that we have everything there that we used to have in the
now harder to get to "background" menu.

https://bugzilla.gnome.org/show_bug.cgi?id=667386
Merge commit 'd9ef715ea11e92917414d5d7bddd4dd1487fac1b' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-file.c
	libnemo-private/nemo-thumbnails.c
	libnemo-private/nemo-thumbnails.h
	libnemo-private/nemo-ui-utilities.c
	libnemo-private/nemo-ui-utilities.h
	po/el.po
	po/pl.po
	po/ta.po
Merge commit 'c68a487c8faaad3afede2b6454f0c1f5a006de0a' into nemo_master_merge

Conflicts:
	po/gl.po
	src/nemo-canvas-view.c
	src/nemo-floating-bar.c
	src/nemo-floating-bar.h
	src/nemo-list-view.c
	src/nemo-view.c
	src/nemo-view.h
	src/nemo-window-manage-views.c
	src/nemo-window-slot.c
	src/nemo-window-slot.h
Replace line feeds in window title with the LF character
Merge commit '9455df5c199d11b1799e3fc7be9bc8baf059c02e' into nemo_master_merge

Conflicts:
	po/pl.po
	src/nemo-file-management-properties.glade
Revert: list-view: remove context-menu on blank space

Merge commit '1aab9dc4bd3b9046948e7a3e5efbb7b85af620ab' into nemo_master_merge

Conflicts:
	src/nemo-list-view.c
Revert: Menu Changes

Merge commit 'c8b27b3b8b815a993b1536336cdbc5d1089f2e7c' into nemo_master_merge

Conflicts:
	src/nautilus-canvas-view-ui.xml
	src/nautilus-directory-view-ui.xml
	src/nemo-shell-ui.xml
	src/nemo-window-menus.c