[ekiga] Some string fixes

[Eugen Dedu <ededu src gnome org>]

commit f7621509e078001225e7596795b85566b315d155
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Thu Nov 29 23:49:15 2012 +0100

    Some string fixes

 lib/engine/gui/gtk-frontend/call-window.cpp |   20 ++++++++++----------
 plugins/loudmouth/loudmouth-account.cpp     |   18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index eb747df..5cc40aa 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -162,12 +162,11 @@ struct _EkigaCallWindowPrivate
   GtkWidget *qualitymeter;
 
   /* The problem is the following :
-   * without that boolean, changing the ui will trigger
-   * a callback, which will store in the settings that
-   * the user wants only local video... in fact the
-   * problem is that we use a single ui+settings to mean
-   * both "what the user wants during a call"
-   * and "what we are doing right now".
+   * without that boolean, changing the ui will trigger a callback,
+   * which will store in the settings that the user wants only local
+   * video... in fact the problem is that we use a single ui+settings
+   * to mean both "what the user wants during a call" and "what we are
+   * doing right now".
    *
    * So we set that boolean to true,
    * ask the ui to change,
@@ -2041,8 +2040,8 @@ ekiga_call_window_init_menu (EkigaCallWindow *cw)
 			   NULL, '3',
 			   G_CALLBACK (display_changed_cb), cw,
 			   false, false),
-      GTK_MENU_RADIO_ENTRY("extended_video", _("Extended Video Roles"),
-			   _("Extended Video Roles"),
+      GTK_MENU_RADIO_ENTRY("extended_video", _("_Extended Video"),
+			   _("Extended Video Images"),
 			   NULL, '4',
 			   G_CALLBACK (display_changed_cb), cw,
 			   false, false),
@@ -2389,7 +2388,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
   gtk_widget_show_all (cw->priv->call_frame);
   gtk_widget_hide (cw->priv->spinner);
 
-  /* Pick-up */
+  /* Pick up */
   item = gtk_tool_item_new ();
   cw->priv->pickup_button = gtk_button_new ();
   image = gtk_image_new_from_icon_name ("phone-pick-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
@@ -2401,10 +2400,11 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
 		      GTK_TOOL_ITEM (item), -1);
   gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), false);
   gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
-				  _("Hang up the current call"));
+				  _("Pick up the current call"));
   g_signal_connect (cw->priv->pickup_button, "clicked",
 		    G_CALLBACK (pickup_call_cb), cw);
 
+  /* Hang up */
   item = gtk_tool_item_new ();
   cw->priv->hangup_button = gtk_button_new ();
   image = gtk_image_new_from_icon_name ("phone-hang-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
diff --git a/plugins/loudmouth/loudmouth-account.cpp b/plugins/loudmouth/loudmouth-account.cpp
index f5f611e..9c0e0b3 100644
--- a/plugins/loudmouth/loudmouth-account.cpp
+++ b/plugins/loudmouth/loudmouth-account.cpp
@@ -109,7 +109,7 @@ LM::Account::Account (boost::shared_ptr<Ekiga::PersonalDetails> details_,
 {
   if (node == NULL) throw std::logic_error ("NULL node pointer received");
 
-  status = _("inactive");
+  status = _("Inactive");
 
   xmlChar* xml_str = xmlGetProp (node, BAD_CAST "startup");
   bool enable_on_startup = false;
@@ -156,7 +156,7 @@ LM::Account::Account (boost::shared_ptr<Ekiga::PersonalDetails> details_,
 		      bool enable_on_startup):
   details(details_), dialect(dialect_), cluster(cluster_)
 {
-  status = _("inactive");
+  status = _("Inactive");
 
   node = xmlNewNode (NULL, BAD_CAST "entry");
   xmlSetProp (node, BAD_CAST "name", BAD_CAST name.c_str ());
@@ -235,13 +235,13 @@ LM::Account::enable ()
 
     gchar* message = NULL;
 
-    message = g_strdup_printf (_("error connecting (%s)"), error->message);
+    message = g_strdup_printf (_("Could not connect (%s)"), error->message);
     status = message;
     g_free (message);
     g_error_free (error);
   } else {
 
-    status = _("connecting");
+    status = _("Connecting...");
   }
 
   xmlFree (server);
@@ -281,7 +281,7 @@ LM::Account::on_connection_opened (bool result)
     xmlChar* user = xmlGetProp (node, BAD_CAST "user");
     xmlChar* password = xmlGetProp (node, BAD_CAST "password");
     xmlChar* resource = xmlGetProp (node, BAD_CAST "resource");
-    status = _("authenticating");
+    status = _("Authenticating...");
     lm_connection_authenticate (connection, (const char*)user,
 				(const char*)password, (const char*)resource,
 				(LmResultFunction)on_authenticate_c, this, NULL, NULL);
@@ -291,7 +291,7 @@ LM::Account::on_connection_opened (bool result)
   } else {
 
     /* FIXME: can't we report better? */
-    status = _("error connecting");
+    status = _("Could not connect");
     updated ();
   }
 }
@@ -301,7 +301,7 @@ LM::Account::on_disconnected (LmDisconnectReason /*reason*/)
 {
   handle_down ();
 
-  status = _("disconnected");
+  status = _("Disconnected");
   updated ();
 }
 
@@ -311,13 +311,13 @@ LM::Account::on_authenticate (bool result)
   if (result) {
 
     handle_up ();
-    status = _("connected");
+    status = _("Connected");
     updated ();
   } else {
 
     lm_connection_close (connection, NULL);
     // FIXME: can't we report something better?
-    status = _("error authenticating loudmouth account");
+    status = _("Could not authenticate");
     updated ();
   }
 }