[gedit] (4 commits) Non-fast-forward update to branch zbrown/fix-408

[Jordi Mas <jmas src gnome org>]

The branch 'zbrown/fix-408' 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:

  ff8e007... file-browser: drop use of confirm-trash

Commits added to the branch:

  a8edff4... Update Portuguese translation (*)
  88d4d1d... Update Brazilian Portuguese translation (*)
  a8cb2b5... Update Punjabi translation (*)
  8f6490c... file-browser: drop use of confirm-trash

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