[geary/wip/713150-conversations: 4/4] Merge branch 'master' into wip/713150-conversations

[Jim Nelson <jnelson src gnome org>]

commit fd20d9de8f91c8966a10b28085736677c0456d3e
Merge: 46a3e2e f9e8502
Author: Jim Nelson <jim yorba org>
Date:   Thu Mar 19 18:40:18 2015 -0700

    Merge branch 'master' into wip/713150-conversations

 po/zh_TW.po                                        |  556 +++++++++++---------
 src/client/application/geary-controller.vala       |    2 +
 src/engine/imap/api/imap-account.vala              |   20 +-
 .../transport/imap-client-session-manager.vala     |   20 +-
 4 files changed, 336 insertions(+), 262 deletions(-)
---
diff --cc src/client/application/geary-controller.vala
index 72cd066,39e2330..fdbb8fa
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@@ -57,8 -57,9 +57,9 @@@ public class GearyController : Geary.Ba
      
      public const string PROP_CURRENT_CONVERSATION ="current-conversations";
      
 -    public const int MIN_CONVERSATION_COUNT = 50;
 +    private const double LOAD_MORE_PERCENTAGE = 0.40;
      
+     private const string DELETE_MESSAGE_LABEL = _("Delete conversation");
      private const string DELETE_MESSAGE_TOOLTIP_SINGLE = _("Delete conversation (Shift+Delete)");
      private const string DELETE_MESSAGE_TOOLTIP_MULTIPLE = _("Delete conversations (Shift+Delete)");
      private const string DELETE_MESSAGE_ICON_NAME = "edit-delete-symbolic";