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

  13b40b2... Add candidate-encodings gsetting
  4b7dc13... Remove auto-detected and shown-in-menu gsettings (not finis

Commits added to the branch:

  b7c983d... l10n: Update Japanese translation (*)
  7a5d1f8... plugin/spell : change deprecated accels methods (*)
  d1cf548... Updated Greek translation (*)
  bdefe15... open-document-selector : react to font changes (*)
  ff71b84... fullscreen mode : center the view on screen (*)
  82dabac... Updated Basque language (*)
  279ee18... Set textdomain as soon as possible (*)
  d21f6f5... pythonconsole: replace deprecated method (*)
  3c1abe0... Cleanup some unused includes (*)
  dbfa04f... snippets: use gtk_source_file_get_encoding() (*)
  e5234e6... Adapt for gtk_source_file_get_encoding() NULL return value (*)
  1ad3e62... API doc update (*)
  46ff9ba... EncodingsComboBox: rename column enums (*)
  4a9cfad... Add candidate-encodings gsetting
  e4c736b... EncodingsComboBox: code clean-up, improve doc

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