Merge lp:~kelemeng/gwibber/bug926665 into lp:gwibber

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 1282
Proposed branch: lp:~kelemeng/gwibber/bug926665
Merge into: lp:gwibber
Diff against target: 33 lines (+3/-2)
2 files modified
libgwibber-gtk/stream-view-tile.vala (+2/-2)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/gwibber/bug926665
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+91548@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgwibber-gtk/stream-view-tile.vala'
2--- libgwibber-gtk/stream-view-tile.vala 2012-02-01 14:18:29 +0000
3+++ libgwibber-gtk/stream-view-tile.vala 2012-02-04 14:02:18 +0000
4@@ -221,7 +221,7 @@
5 thumb_box.add (thumbnail);
6 var thumb_hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
7 thumb_hbox.pack_start (thumb_box, false, false, 0);
8- _thumb_expander = new Gtk.Expander.with_mnemonic ("_Show");
9+ _thumb_expander = new Gtk.Expander.with_mnemonic (_("_Show"));
10 _thumb_expander.set_no_show_all (true);
11 _thumb_expander.add (thumb_hbox);
12 vbox.pack_start (_thumb_expander, false, false, 4);
13@@ -232,7 +232,7 @@
14 return false;
15 });
16
17- _comments_expander = new Gtk.Expander.with_mnemonic ("_Comments");
18+ _comments_expander = new Gtk.Expander.with_mnemonic (_("_Comments"));
19 comments_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
20 comments_box.set_no_show_all (true);
21 _comments_expander.add (comments_box);
22
23=== modified file 'po/POTFILES.in'
24--- po/POTFILES.in 2011-12-06 19:58:21 +0000
25+++ po/POTFILES.in 2012-02-04 14:02:18 +0000
26@@ -24,6 +24,7 @@
27 libgwibber-gtk/stream-view-tile.vala
28 libgwibber-gtk/stream-view.vala
29 libgwibber-gtk/action-box.vala
30+libgwibber-gtk/user-view-tile.vala
31 lens/src/daemon.vala
32 lens/src/main.vala
33 gwibber/actions.py