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

  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 

Commits added to the branch:

  6eb5e33... Disable completion during replace all (*)
  ce52932... Do not merge xml translation in gschema files (*)
  7b589ae... Fix distcheck (*)
  44aee7f... Fix compilation warning (*)
  0ddd90f... Replace 'auto-detected' encoding gsetting by 'candidate-enc
  16f97ab... EncodingsDialog: make displayed encodings not sortable
  0a4d5be... EncodingsDialog: show UTF-8 in the available encodings
  c875523... Remove shown-in-menu encoding gsetting
  9bce1b7... EncodingsDialog: "displayed" -> "chosen"
  7c0d1e2... EncodingsDialog: update UI "shown in menu" -> "chosen"
  ebe8cb6... EncodingsDialog: a few better function names
  260533d... EncodingsDialog: remove candidates_list attribute
  ab61752... EncodingsDialog: remove chosen encodings in the available e
  b9552ba... EncodingsDialog: add COLUMN_ENCODING
  19b6a51... EncodingsDialog: add Up and Down buttons to order chosen en
  d27f526... EncodingsDialog: add Reset button
  74336d3... EncodingItems: get default candidates if the gsetting is em
  32866c3... gedit_settings_get_candidate_encodings()
  05bd74f... EncodingsComboBox: update menu even if dialog was cancelled
  4e66379... EncodingsDialog: save gsetting only if list modified
  7163b10... EncodingsDialog: set Remove button as insensitive for UTF-8
  dc2b997... EncodingsDialog: ensure that UTF-8 and current cannot be re
  55bb1e3... utils: remove encoding functions
  6deba1b... EncodingsDialog: add "(Current Locale)" for... the current 
  772ca56... EncodingsDialog: Reset button sensitivity
  8d7d134... EncodingsDialog: replace OK + Cancel -> Close button

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