[nautilus] (32 commits) Non-fast-forward update to branch wip/antoniof/column-chooser-dialog-rework

[António Fernandes <antoniof src gnome org>]

The branch 'wip/antoniof/column-chooser-dialog-rework' 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:

  bfe07d6... column-chooser: Build interface from template XML
  6ba7492... column-chooser: Move some function definitions
  9505673... list-view: Build column editor with GtkBuilder

Commits added to the branch:

  bc3edaa... file-conflict-dialog: Don't change action when unchecking (*)
  42b0362... build: Remove incorrect i18n.merge_file argument (*)
  6afce41... trash-bar: Ellipsize subtitle label (*)
  a520e27... files-view: Clear :templates-menu if it should not be used (*)
  4a44f3d... files-view: Only refresh New Document menu if needed (*)
  2804732... files-view: Only refresh Scripts menu if needed (*)
  4b3f118... files-view: Clean up submenus update code (*)
  ca5283a... Release version 41.1 (*)
  5cc496a... Post branch version bump (*)
  906151b... rename-file-popover: update ui file syntax (*)
  dbeeec0... rename-file-popover: implement redesign (*)
  33ff2de... batch-rename-dialog: Replace GtkStateType with GtkStateFlag (*)
  bc2cb5e... batch-rename-dialog: Don't use gtk_widget_get_preferred_hei (*)
  bb35400... batch-rename-dialog: Don't recreate separator if one exists (*)
  02a2fe8... batch-rename-dialog: Remove always TRUE boolean param/data (*)
  804a55f... batch-rename-dialog: Don't add separator above first row (*)
  85e7023... batch-rename-dialog: Don't keep a list of rows (*)
  f0ce14c... batch-rename-dialog: Don't use GtkContainer::add() (*)
  79dca04... persistence-handler: Drop the word successfully from notifi (*)
  f291480... Update Portuguese translation (*)
  7188a04... Update Brazilian Portuguese translation (*)
  7512a43... Update Ukrainian translation (*)
  4b990c4... Update Persian translation (*)
  3270f73... Update Persian translation (*)
  f190000... Update Friulian translation (*)
  6b0bc70... Update Occitan translation (*)
  e74009b... Update Portuguese translation (*)
  b2c67de... flatpak: Pin libportal dependency (*)
  0eb2dae... Update Catalan translation (*)
  1cf6817... column-chooser: Build interface from template XML
  a9fda5a... column-chooser: Move some function definitions
  022a075... list-view: Build column editor with GtkBuilder

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