Merge lp:~kelemeng/activity-log-manager/bug957891 into lp:~activity-log-manager/activity-log-manager/vala

Proposed by Gabor Kelemen on 2012-03-17
Status: Merged
Merged at revision: 101
Proposed branch: lp:~kelemeng/activity-log-manager/bug957891
Merge into: lp:~activity-log-manager/activity-log-manager/vala
Diff against target: 48 lines (+5/-2)
3 files modified
po/POTFILES.in (+1/-0)
src/alm-cc.c (+3/-2)
src/diagnostics-widget.c (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/activity-log-manager/bug957891
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) 2012-03-17 Approve on 2012-03-18
Review via email: mp+98054@code.launchpad.net
To post a comment you must log in.

Everything looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2012-03-01 21:26:12 +0000
3+++ po/POTFILES.in 2012-03-17 13:08:18 +0000
4@@ -2,6 +2,7 @@
5 data/activity-log-manager.desktop.in
6 src/activity-log-manager.vala
7 src/alm.vala
8+src/alm-cc.c
9 src/blacklist-dbus.vala
10 src/applications-widget.vala
11 src/files-widget.vala
12
13=== modified file 'src/alm-cc.c'
14--- src/alm-cc.c 2012-02-21 23:14:24 +0000
15+++ src/alm-cc.c 2012-03-17 13:08:18 +0000
16@@ -16,9 +16,10 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.";
18 */
19
20+#include "config.h"
21+#include <glib/gi18n-lib.h>
22 #include <gtk/gtk.h>
23 #include <libgnome-control-center/cc-panel.h>
24-#include "config.h"
25
26 extern void* alm_activity_log_manager_new (void);
27 #ifdef HAVE_WHOOPSIE
28@@ -59,7 +60,7 @@
29 GtkWidget *widget = GTK_WIDGET (alm_activity_log_manager_new ());
30 #ifdef HAVE_WHOOPSIE
31 GtkWidget *whoopsie = GTK_WIDGET (whoopsie_daisy_preferences_new ());
32- alm_activity_log_manager_append_page (widget, whoopsie, "Diagnostics");
33+ alm_activity_log_manager_append_page (widget, whoopsie, _("Diagnostics"));
34 #endif
35 gtk_widget_show_all (widget);
36 gtk_container_add (GTK_CONTAINER (self), widget);
37
38=== modified file 'src/diagnostics-widget.c'
39--- src/diagnostics-widget.c 2012-02-21 23:37:33 +0000
40+++ src/diagnostics-widget.c 2012-03-17 13:08:18 +0000
41@@ -142,6 +142,7 @@
42 priv = self->priv = WHOOPSIE_DAISY_PREFERENCES_PRIVATE (self);
43
44 priv->builder = gtk_builder_new ();
45+ gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
46 gtk_builder_add_from_file(priv->builder, GNOMECC_UI_DIR "/whoopsie.ui", &error);
47 if (error != NULL) {
48 g_warning ("Could not load interface file: %s", error->message);

Subscribers

People subscribed via source and target branches