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

[Carlos Soriano <csoriano src gnome org>]

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

  40d7cf0... views: Add flow box based view
  a0b80e9... F
  0f424b1... icon-view: improve performance
  21ff6bc... f
  9853b57... zooms working
  78eb133... f
  3b49d5c... f
  fb10366... a
  4901518... add max-width container

Commits added to the branch:

  f0eea48... Update Chinese (Taiwan) translation (*)
  3759585... properties-window: fix checking inconsistent state (*)
  0d39b02... Update Kazakh translation (*)
  c0cdf8b... Updated Norwegian bokmål translation. (*)
  3050a9c... files-view: remove an unnecessary helper function (*)
  838691f... general: format code with newer Uncrustify (*)
  fe38050... views: Add flow box based view

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