[gedit] (33 commits) Non-fast-forward update to branch wip/merge-encoding-settings

[Sébastien Wilmet <swilmet src gnome org>]

The branch 'wip/merge-encoding-settings' 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:

  a93a6d4... Replace 'auto-detected' encoding gsetting by 'candidate-enc
  73b3526... EncodingsDialog: make displayed encodings not sortable
  e91ac2c... EncodingsDialog: show UTF-8 in the available encodings
  3c1558d... Remove shown-in-menu encoding gsetting
  97153c5... EncodingsDialog: "displayed" -> "chosen"
  dcccd7d... EncodingsDialog: update UI "shown in menu" -> "chosen"
  81bd862... EncodingsDialog: a few better function names
  1027332... EncodingsDialog: remove candidates_list attribute
  6fff8c4... EncodingsDialog: remove chosen encodings in the available e
  d233642... EncodingsDialog: add COLUMN_ENCODING
  6ff5959... EncodingsDialog: add Up and Down buttons to order chosen en
  86026bd... EncodingsDialog: add Reset button
  8d41813... EncodingItems: get default candidates if the gsetting is em
  82bde1c... gedit_settings_get_candidate_encodings()
  7c401b5... EncodingsComboBox: update menu even if dialog was cancelled
  c5c1e55... EncodingsDialog: save gsetting only if list modified
  af91836... EncodingsDialog: set Remove button as insensitive for UTF-8
  74075cd... EncodingsDialog: ensure that UTF-8 and current cannot be re

Commits added to the branch:

  97b9b04... Update Aragonese translation (*)
  0fab983... Updated Russian translation (*)
  89268c6... Fix desktop actions (*)
  e4ade77... Finnish translation update (*)
  09367c1... win32: fix typo in open selector store. Thanks LRN (*)
  b118a79... Updated German translation (*)
  7e52152... l10n: Update Japanese translation (*)
  6f8f951... Updated Basque language (*)
  fa5259f... Release 3.16.0 (*)
  f982a19... notebook-stack-switcher: fix assertion at exit (*)
  89a6872... Improve error reporting when failing to load private lib (*)
  26ee553... Updated French translation (*)
  72fc09d... Updated Esperanto translation (*)
  2d866ef... Update Arabic translation (*)
  33cdcf4... Update Catalan translation (*)
  1e64d8f... Replace 'auto-detected' encoding gsetting by 'candidate-enc
  429f578... EncodingsDialog: make displayed encodings not sortable
  acb6e62... EncodingsDialog: show UTF-8 in the available encodings
  7137829... Remove shown-in-menu encoding gsetting
  34c039d... EncodingsDialog: "displayed" -> "chosen"
  5065008... EncodingsDialog: update UI "shown in menu" -> "chosen"
  4c8615a... EncodingsDialog: a few better function names
  7750008... EncodingsDialog: remove candidates_list attribute
  a3fca7b... EncodingsDialog: remove chosen encodings in the available e
  cb05cf4... EncodingsDialog: add COLUMN_ENCODING
  f2f2f54... EncodingsDialog: add Up and Down buttons to order chosen en
  991ca77... EncodingsDialog: add Reset button
  7aaa896... EncodingItems: get default candidates if the gsetting is em
  899ccc4... gedit_settings_get_candidate_encodings()
  87eb569... EncodingsComboBox: update menu even if dialog was cancelled
  83dd862... EncodingsDialog: save gsetting only if list modified
  d15567f... EncodingsDialog: set Remove button as insensitive for UTF-8
  efcfe77... EncodingsDialog: ensure that UTF-8 and current cannot be re

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