Assamese translation updated
Implemented FUEL entries to Assamese translation
Use action defines instead of text

This makes them easier to grep for and change.
Updated Norwegian bokmål translation
Try to store names for bookmarked uris

https://bugzilla.gnome.org/show_bug.cgi?id=524116
Set a better file display name by default

https://bugzilla.gnome.org/show_bug.cgi?id=524116
Updated POTFILES.in
window: never sync the View As actions for the desktop

Since doing so can set a view_id != NAUTILUS_DESKTOP_CANVAS_VIEW_ID to
its view, which will have bad consequences (i.e. a crash) when
finalizing the views at application quit.
This commit fixes it by making sync_view_as_menus an overriddable class
method.
bookmarks-window: make this a real GtkWindow subclass

This was long overdue, and in addition to making the whole code a
little cleaner, it also allows us to disconnect signals from objects
that outlive the window in dispose() (such as NautilusBookmarkList).

This also fixes the crasher reported in
https://bugzilla.gnome.org/show_bug.cgi?id=682916
Don't initialize the desktop link monitor when it isn't needed
Updated Galician translations
Make sure the file is trashable before offering to move to Trash

https://bugzilla.gnome.org/show_bug.cgi?id=154478
Remove unnecessary gdk_threads_enter/leave calls

Since we don't ever call gdk_threads_init()
Merge commit '88e353645d314f985e53855de28326165b4e262f' into nemo_master_merge

Conflicts:
	po/as.po
	src/nemo-actions.h
	src/nemo-view.c
Merge commit '874f69f244ba397925fe71f9500ac21bed761bb0' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-directory.c
	po/nb.po
	src/nemo-places-sidebar.c
	src/nemo-window-manage-views.c
Merge commit 'a4ecbd076f82809d6b95c59911b157364f538c8c' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-desktop-link-monitor.c
	libnemo-private/nemo-desktop-link-monitor.h
	libnemo-private/nemo-thumbnails.c
	po/POTFILES.in
	po/gl.po
	src/nemo-application.c
	src/nemo-bookmarks-window.c
	src/nemo-bookmarks-window.h
	src/nemo-desktop-window.c
	src/nemo-mime-actions.c
	src/nemo-window-private.h
	src/nemo-window.c
	src/nemo-window.h