[nautilus] (6 commits) Non-fast-forward update to branch wip/oholy/google-drive-conflict-dialog

[Ondrej Holy <oholy src gnome org>]

The branch 'wip/oholy/google-drive-conflict-dialog' 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:

  e6a62a9... file-operations: Fix conflict dialog for google-drive

Commits added to the branch:

  9ac9300... Update Finnish translation (*)
  0fbe858... Update Friulian translation (*)
  4afed79... Update Malay translation (*)
  24ddced... Update Karbi translation (*)
  1c63464... Release version 3.35.90 (*)
  12aaac0... file-operations: Fix conflict dialog for google-drive

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