From 4c56821d84e3dbd90108986c9a4347f7c460c4d1 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 11 Feb 2010 17:14:56 +0000
Subject: Rephrase the helper text and change "Login ID" to "Username"

Thanks to Nick Richards for his suggestions.
---
 libempathy-gtk/empathy-account-widget-jabber.ui | 12 +++++++-----
 libempathy-gtk/empathy-account-widget.c         |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'libempathy-gtk')

diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index fb9249b9b..76f11de12 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -140,8 +140,9 @@
               <object class="GtkLabel" id="label_username_f_example">
                 <property name="xalign">0</property>
                 <property name="xpad">3</property>
-                <property name="label" translatable="yes">If you are http://facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to define your Facebook alias.</property>
+                <property name="label" translatable="yes">This is your username, not your normal Facebook login.
+If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
+Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
                 <property name="use_markup">True</property>
                 <attributes>
                   <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
@@ -623,7 +624,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to def
       <object class="GtkLabel" id="label_id_fb_simple">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Facebook ID?</property>
+        <property name="label" translatable="yes">What is your Facebook username?</property>
       </object>
       <packing>
         <property name="position">0</property>
@@ -658,8 +659,9 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to def
               <object class="GtkLabel" id="label_fb_example">
                 <property name="visible">True</property>
                 <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">If you are http://facebook.com/badger, enter badger.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to define your Facebook alias.</property>
+                <property name="label" translatable="yes">This is your username, not your normal Facebook login.
+If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
+Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
                 <property name="use_markup">True</property>
                 <attributes>
                   <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 4124388d8..b17dca72f 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1098,6 +1098,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
           "label_username_f_example", &label_example_fb,
           "expander_advanced", &expander_advanced,
           "entry_id", &entry_id,
+          "label_id", &label_id,
           NULL);
 
       empathy_account_widget_handle_params (self,
@@ -1113,6 +1114,8 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
 
       if (is_facebook)
         {
+          gtk_label_set_label (GTK_LABEL (label_id), _("Username:"));
+
           /* Facebook special case the entry ID widget to hide the
            * "@chat.facebook.com" part */
           setup_facebook_id_widget (self, entry_id);
-- 
cgit v1.2.3