[gnome-characters: 2/3] Merge remote-tracking branch 'origin/wip/template'

[Daiki Ueno <dueno src gnome org>]

commit 773f2274e16908239edd4c6f0f4eb188c3f4ef0f
Merge: f3da316 05e1efe
Author: Daiki Ueno <dueno src gnome org>
Date:   Mon Feb 9 21:25:56 2015 +0900

    Merge remote-tracking branch 'origin/wip/template'
    
    Conflicts:
        src/window.js

 data/character.ui  |  160 +++++++++++++++++++++++++++-------------------------
 data/mainview.ui   |   93 +++++++++++++++++-------------
 data/mainwindow.ui |   88 +++++++++++++++-------------
 src/character.js   |   45 ++++++---------
 src/window.js      |   52 ++++++-----------
 5 files changed, 221 insertions(+), 217 deletions(-)
---
diff --cc src/window.js
index 0d93da4,8df0fac..306b656
--- a/src/window.js
+++ b/src/window.js
@@@ -179,7 -165,7 +168,7 @@@ const MainWindow = new Lang.Class(
  
          Util.assertNotEqual(category, null);
          this._mainView.setPage(category.name);
-         this._headerBar.title = Gettext.gettext(category.title);
 -        this._main_headerbar.title = Gettext.gettext(category.label);
++        this._main_headerbar.title = Gettext.gettext(category.title);
      },
  
      _character: function(action, v) {