[balsa] (7 commits) Non-fast-forward update to branch 69-resend-message

[Peter Bloomfield <peterb src gnome org>]

The branch '69-resend-message' 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:

  2f6ec53... Various: Begin implementing resending
  08069cd... New UI file for resend window

Commits added to the branch:

  c6cfa76... Update Brazilian Portuguese translation (*)
  14a8ad1... Updated Spanish translation (*)
  787a732... Update Chinese (China) translation (*)
  84093e4... Various: Begin implementing resending
  0a76673... New UI file for resend window
  98947c1... sendmsg-window: Clean up case SEND_RESEND
  3b80a53... send: Handle resending a message

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