[gedit] (23 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:

  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
  f3482e2... utils: remove encoding functions
  9764864... EncodingsDialog: add "(Current Locale)" for... the current 

Commits added to the branch:

  56465c9... Translation pa updated for Gnome (*)
  9f10229... Do not emit cursor-moved when we are inside an user action (*)
  170091e... Chain up begin/end_user_action (*)
  a82c5c5... Replace 'auto-detected' encoding gsetting by 'candidate-enc
  47cc3ba... EncodingsDialog: make displayed encodings not sortable
  dabe10a... EncodingsDialog: show UTF-8 in the available encodings
  4e48eb2... Remove shown-in-menu encoding gsetting
  8ca7f0b... EncodingsDialog: "displayed" -> "chosen"
  a0ffeb0... EncodingsDialog: update UI "shown in menu" -> "chosen"
  a71cc5f... EncodingsDialog: a few better function names
  980c3bf... EncodingsDialog: remove candidates_list attribute
  b7c10d1... EncodingsDialog: remove chosen encodings in the available e
  80de64e... EncodingsDialog: add COLUMN_ENCODING
  8d525fd... EncodingsDialog: add Up and Down buttons to order chosen en
  921cf1e... EncodingsDialog: add Reset button
  8aa0a30... EncodingItems: get default candidates if the gsetting is em
  1ae511a... gedit_settings_get_candidate_encodings()
  235df95... EncodingsComboBox: update menu even if dialog was cancelled
  b59071f... EncodingsDialog: save gsetting only if list modified
  3741c2e... EncodingsDialog: set Remove button as insensitive for UTF-8
  a71074d... EncodingsDialog: ensure that UTF-8 and current cannot be re
  df08f80... utils: remove encoding functions
  5a39d81... EncodingsDialog: add "(Current Locale)" for... the current 

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