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

[jschamp svn gnome org]

Author: jschamp
Date: Sat Sep 27 21:37:15 2008
New Revision: 7107
URL: http://svn.gnome.org/viewvc/ekiga?rev=7107&view=rev

Log:
Reverted string changes from rev 7071

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/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	Sat Sep 27 21:37:15 2008
@@ -2,6 +2,5 @@
 - Fix possible X timing issue
 - Fix message box when device was unplugged in out-of-call state (#552262)
 - 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	Sat Sep 27 21:37:15 2008
@@ -146,7 +146,7 @@
 History::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
   builder.add_action ("clear",
-		      "Clear history", sigc::mem_fun (this,
+		      "Clear", 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	Sat Sep 27 21:37:15 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 addressbook"),
+  builder.add_action ("remove", _("_Remove"),
 		      sigc::mem_fun (this, &OPENLDAP::Book::remove));
-  builder.add_action ("properties", _("Addressbook _properties"),
+  builder.add_action ("properties", _("_Properties"),
 		      sigc::mem_fun (this, &OPENLDAP::Book::edit));
 
   return true;

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	Sat Sep 27 21:37:15 2008
@@ -779,7 +779,7 @@
     break;
 
   case SIP_PDU::Failure_ProxyAuthenticationRequired:
-    info = _("Proxy authentication required");
+    info = _("Proxy auth. 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	Sat Sep 27 21:37:15 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 two things:\n"
+                            "To enable this, you need to do three 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	Sat Sep 27 21:37:15 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 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);
+      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);
       break;
 
     case Ekiga::AO_ERROR_NONE: