Save a bit of space in the preferences dialog height
make view mode persistant to window, not folder

We now have a nicely exposed view mode toggle on the toolbar. When traversing
the hierarchy it feels wring the view changes. I think it makes more sense to
relate the view mode to the window rather than the folder/location.

https://bugzilla.gnome.org/show_bug.cgi?id=682017
Don't set zoom level per folder

Since this is now a per view option.

https://bugzilla.gnome.org/show_bug.cgi?id=682017
use plural form only for messages with explicit number

https://bugzilla.gnome.org/show_bug.cgi?id=552053
Add ability to reorder bookmarks

https://bugzilla.gnome.org/show_bug.cgi?id=575034
bookmarks-editor: theming and tooltip string fixes
bookmarks-window: set as transient for the parent window

And make it center on the parent too.
release: prepare for 3.5.90
do not display Templates Directory clue bar if templates directory is disabled

https://bugzilla.gnome.org/show_bug.cgi?id=682335
Updated Lithuanian translation
Updated Arabic translation
update Punjabi Translation
Don't show properties for the Network locations

https://bugzilla.gnome.org/show_bug.cgi?id=682371
Don't inspect a null default app

https://bugzilla.gnome.org/show_bug.cgi?id=682372
Updated Norwegian bokmål translation
Set parent for all mount/eject error dialogs

https://bugzilla.gnome.org/show_bug.cgi?id=590513
Don't show captions that make no sense

https://bugzilla.gnome.org/show_bug.cgi?id=564766
Use more specific text for unmount/eject error messages

https://bugzilla.gnome.org/show_bug.cgi?id=590513
Place mounts with no volumes in Devices section of sidebar

https://bugzilla.gnome.org/show_bug.cgi?id=682353
Revert: ave a bit of space in the preferences dialog height

Merge commit 'a9c8ccba4337403d526de38bd07f6a2e8d25b132' into nemo_master_merge

Conflicts:
	src/nemo-file-management-properties.glade