Merge branch 'gnome-3-8'

[empathy.git] / src / empathy-debug-window.c

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 9e3e7f38169e5c365f1d9bff7e895128594c1356..6cc60098f97dbbb03a651059eff54017244f4b7f 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -20,28 +20,17 @@
 */
 
 #include "config.h"
-
-#include <string.h>
+#include "empathy-debug-window.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <gdk/gdkkeysyms.h>
 #include <libsoup/soup.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "extensions/extensions.h"
-
-#include "empathy-debug-window.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
     GTK_TYPE_WINDOW)
@@ -2027,12 +2016,12 @@ am_prepared_cb (GObject *am,
   gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO);
 
   label = gtk_label_new (
-        _("Even if they don't display passwords, logs can contain sensible "
+        _("Even if they don't display passwords, logs can contain sensitive "
           "information such as your list of contacts or the messages you "
           "recently sent or received.\nIf you don't want to see such "
           "information available in a public bug report, you "
           "can choose to limit the visibility of your bug to "
-          "Empathy developpers when reporting it by displaying "
+          "Empathy developers when reporting it by displaying "
           "the advanced fields in the "
           "<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">"
           "bug report</a>."));