ekiga r7071 - in branches/gnome-2-24: . lib/engine/addressbook/call-history lib/engine/addressbook/ldap lib/engine/gui/gtk-frontend src/endpoints src/gui

[jschamp svn gnome org]

Author: jschamp
Date: Tue Sep 23 17:43:01 2008
New Revision: 7071
URL: http://svn.gnome.org/viewvc/ekiga?rev=7071&view=rev

Log:
Correctly hide addressbook and chat window when the user clicks close; various string/typo/translator comment fixes

Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/lib/engine/addressbook/call-history/history-book.cpp
   branches/gnome-2-24/lib/engine/addressbook/ldap/ldap-book.cpp
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window.cpp
   branches/gnome-2-24/src/endpoints/opal-account.cpp
   branches/gnome-2-24/src/endpoints/sip-endpoint.cpp
   branches/gnome-2-24/src/gui/assistant.cpp
   branches/gnome-2-24/src/gui/main.cpp

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Tue Sep 23 17:43:01 2008
@@ -1 +1,5 @@
+Changes since Ekiga 3.00
+- Fix handling when closing addressbook- and chat-window using the window frame (Jan Schampera)
+- Various string fixes, typo fixes, translator helps (Jan Schampera)
+
 Ekiga 3.00

Modified: branches/gnome-2-24/lib/engine/addressbook/call-history/history-book.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/addressbook/call-history/history-book.cpp	(original)
+++ branches/gnome-2-24/lib/engine/addressbook/call-history/history-book.cpp	Tue Sep 23 17:43:01 2008
@@ -146,7 +146,7 @@
 History::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
   builder.add_action ("clear",
-		      "Clear", sigc::mem_fun (this,
+		      "Clear history", sigc::mem_fun (this,
 					      &History::Book::clear));
   return true;
 }

Modified: branches/gnome-2-24/lib/engine/addressbook/ldap/ldap-book.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/addressbook/ldap/ldap-book.cpp	(original)
+++ branches/gnome-2-24/lib/engine/addressbook/ldap/ldap-book.cpp	Tue Sep 23 17:43:01 2008
@@ -310,9 +310,9 @@
   builder.add_action ("refresh", _("_Refresh"),
 		      sigc::mem_fun (this, &OPENLDAP::Book::refresh));
   builder.add_separator ();
-  builder.add_action ("remove", _("_Remove"),
+  builder.add_action ("remove", _("_Remove addressbook"),
 		      sigc::mem_fun (this, &OPENLDAP::Book::remove));
-  builder.add_action ("properties", _("_Properties"),
+  builder.add_action ("properties", _("Addressbook _properties"),
 		      sigc::mem_fun (this, &OPENLDAP::Book::edit));
 
   return true;

Modified: branches/gnome-2-24/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ branches/gnome-2-24/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Tue Sep 23 17:43:01 2008
@@ -661,6 +661,9 @@
 
   gtk_window_set_icon_name (GTK_WINDOW (self), GM_ICON_ADDRESSBOOK);
 
+  g_signal_connect (G_OBJECT (self), "delete-event",
+		    G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
   /* Start building the window */
   vbox = gtk_vbox_new (FALSE, 2);
 

Modified: branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window.cpp
==============================================================================
--- branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window.cpp	(original)
+++ branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window.cpp	Tue Sep 23 17:43:01 2008
@@ -477,6 +477,9 @@
 
   result->priv = new ChatWindowPrivate (core);
 
+  g_signal_connect (G_OBJECT (result), "delete-event",
+		    G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
   result->priv->notebook = gtk_notebook_new ();
   gtk_container_add (GTK_CONTAINER (result), result->priv->notebook);
   gtk_widget_show (result->priv->notebook);

Modified: branches/gnome-2-24/src/endpoints/opal-account.cpp
==============================================================================
--- branches/gnome-2-24/src/endpoints/opal-account.cpp	(original)
+++ branches/gnome-2-24/src/endpoints/opal-account.cpp	Tue Sep 23 17:43:01 2008
@@ -359,6 +359,9 @@
     request.text ("host", _("Gatekeeper:"), get_host ());
   request.text ("user", _("User:"), get_username ());
   if (get_protocol_name () == "SIP")
+    /* Translators:
+     * SIP knows two usernames: The name for the client ("User") and the name
+     * for the authentication procedure ("Authentication User") */
     request.text ("authentication_user", _("Authentication User:"), get_authentication_username ());
   request.private_text ("password", _("Password:"), get_password ());
   request.text ("timeout", _("Timeout:"), str.str ());

Modified: branches/gnome-2-24/src/endpoints/sip-endpoint.cpp
==============================================================================
--- branches/gnome-2-24/src/endpoints/sip-endpoint.cpp	(original)
+++ branches/gnome-2-24/src/endpoints/sip-endpoint.cpp	Tue Sep 23 17:43:01 2008
@@ -779,7 +779,7 @@
     break;
 
   case SIP_PDU::Failure_ProxyAuthenticationRequired:
-    info = _("Proxy auth. required");
+    info = _("Proxy authentication required");
     break;
 
   case SIP_PDU::Failure_LengthRequired:

Modified: branches/gnome-2-24/src/gui/assistant.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/assistant.cpp	(original)
+++ branches/gnome-2-24/src/gui/assistant.cpp	Tue Sep 23 17:43:01 2008
@@ -636,7 +636,7 @@
   label = gtk_label_new (NULL);
   text = g_strdup_printf ("<i>%s</i>",
                           _("You can make calls to regular phones and cell numbers worldwide using Ekiga.\n\n"
-                            "To enable this, you need to do three things:\n"
+                            "To enable this, you need to do two things:\n"
                             "- First buy an account at the URL below.\n"
                             "- Then enter your account ID and PIN code.\n"
                             "The service will work only if your account is created using the URL in this dialog.\n"));

Modified: branches/gnome-2-24/src/gui/main.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/main.cpp	(original)
+++ branches/gnome-2-24/src/gui/main.cpp	Tue Sep 23 17:43:01 2008
@@ -1414,7 +1414,7 @@
       break;
 
     case Ekiga::AO_ERROR_WRITE:
-      dialog_msg = g_strconcat (tmp_msg, "\n\n", _("The selected audio device was successfully opened but it is impossible to write data from this device. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup."), NULL);
+      dialog_msg = g_strconcat (tmp_msg, "\n\n", _("The selected audio device was successfully opened but it is impossible to write data to this device. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup."), NULL);
       break;
 
     case Ekiga::AO_ERROR_NONE:
@@ -4462,9 +4462,13 @@
   g_return_if_fail (mw != NULL);
 
   if ((tr_width > 0) && (tr_height > 0))
+    /* Translators:
+     * TX is a common abbreviation for "transmit" */
     stats_msg_tr = g_strdup_printf (_("TX: %dx%d "), tr_width, tr_height);
 
   if ((re_width > 0) && (re_height > 0)) 
+    /* Translators:
+     * RX is a common abbreviation for "receive" */
     stats_msg_re = g_strdup_printf (_("RX: %dx%d "), re_width, re_height);
 
   stats_msg = g_strdup_printf (_("Lost packets: %.1f %%\nLate packets: %.1f %%\nOut of order packets: %.1f %%\nJitter buffer: %d ms%s%s%s"),