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

[Jim Nelson <jnelson src gnome org>]

commit bd1c4ae2280166ba164e6d4ce06b75066fe57d4c
Merge: 0e4423a eb8fc9d
Author: Jim Nelson <jim yorba org>
Date:   Mon Mar 30 12:46:27 2015 -0700

    Merge branch 'master' into wip/713150-conversations
    
    Conflicts:
        src/client/components/main-window.vala

 po/ca.po                                      |   10 +-
 po/ru.po                                      | 2929 +++++++++++++++----------
 src/client/application/geary-application.vala |   18 +-
 src/client/components/main-window.vala        |   14 +-
 4 files changed, 1814 insertions(+), 1157 deletions(-)
---
diff --cc src/client/components/main-window.vala
index 8d71aeb,3fb763a..55a0ad8
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@@ -34,11 -35,6 +35,10 @@@ public class MainWindow : Gtk.Applicati
      private Geary.AggregateProgressMonitor progress_monitor = new Geary.AggregateProgressMonitor();
      private Geary.ProgressMonitor? conversation_monitor_progress = null;
      private Geary.ProgressMonitor? folder_progress = null;
-     private Geary.Folder? current_folder = null;
 +    private int conversation_list_height = -1;
 +    private int conversation_list_width = -1;
 +    
 +    public signal void conversation_list_height_changed();
      
      public MainWindow(GearyApplication application) {
          Object(application: application);