[ekiga] Use uniform strings in the GUI

[Eugen Dedu <ededu src gnome org>]

commit 744bbf6588182e0a1c609ef4eafb9044b5cb258a
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Jan 11 01:44:49 2011 +0100

    Use uniform strings in the GUI

 ekiga.schemas.in.in               |    2 +-
 plugins/ldap/ldap-book.cpp        |   18 +++++++++---------
 plugins/resource-list/rl-heap.cpp |   12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/ekiga.schemas.in.in b/ekiga.schemas.in.in
index 7691ccd..4f8b44d 100644
--- a/ekiga.schemas.in.in
+++ b/ekiga.schemas.in.in
@@ -801,7 +801,7 @@
       <default>2</default>
       <locale name="C">
 	<short>The default video view</short>
-	<long>The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with local video in a separate window, 4: Both)</long>
+	<long>The default video view (0: Local, 1: Remote, 2: Both, 3: Both in a separate window)</long>
       </locale>
     </schema>
     <schema>
diff --git a/plugins/ldap/ldap-book.cpp b/plugins/ldap/ldap-book.cpp
index 0c046bc..9c8596d 100644
--- a/plugins/ldap/ldap-book.cpp
+++ b/plugins/ldap/ldap-book.cpp
@@ -927,9 +927,9 @@ OPENLDAP::BookForm (boost::shared_ptr<Ekiga::FormRequestSimple> request,
 
   request->instructions (_("Please edit the following fields"));
 
-  request->text ("name", _("Book _Name"), info.name, _("Book name, as shown in your dialog box"));
-  request->text ("uri", _("Server _URI"), info.uri_host, _("Name of LDAP server, prefixed by ldap://";));
-  request->text ("base", _("_Base DN"), info.urld->lud_dn, std::string ());
+  request->text ("name", _("Book _Name:"), info.name, _("Book name, as shown in your dialog box"));
+  request->text ("uri", _("Server _URI:"), info.uri_host, _("Name of LDAP server, prefixed by ldap://";));
+  request->text ("base", _("_Base DN:"), info.urld->lud_dn, std::string ());
 
   {
     std::map<std::string, std::string> choices;
@@ -952,12 +952,12 @@ OPENLDAP::BookForm (boost::shared_ptr<Ekiga::FormRequestSimple> request,
    * "DisplayName" (i.e., "the name that will be displayed") but on
    * most LDAP servers it's "CommonName".
    */
-  request->text ("nameAttr", _("_DisplayName Attribute"), info.urld->lud_attrs[0], std::string ());
-  request->text ("callAttr", _("Call _Attributes"), callAttr, _("The field you are searching for"));
+  request->text ("nameAttr", _("_DisplayName Attribute:"), info.urld->lud_attrs[0], std::string ());
+  request->text ("callAttr", _("Call _Attributes:"), callAttr, _("The field you are searching for"));
   if (info.urld->lud_filter != NULL)
-    request->text ("filter", _("_Filter Template"), info.urld->lud_filter, _("Here, a \"$\" is replaced by the search string"));
+    request->text ("filter", _("_Filter Template:"), info.urld->lud_filter, _("Here, a \"$\" is replaced by the search string"));
   else
-    request->text ("filter", _("_Filter Template"), "", _("Here, a \"$\" is replaced by the search string"));
+    request->text ("filter", _("_Filter Template:"), "", _("Here, a \"$\" is replaced by the search string"));
 
   /* Translators: Bind ID - In LDAP, the operation that begins an LDAP
    * session and authenticates the user to the directory is called a
@@ -968,8 +968,8 @@ OPENLDAP::BookForm (boost::shared_ptr<Ekiga::FormRequestSimple> request,
    * course, the Bind ID can be left blank, in which case the session
    * is anonymous / unauthenticated.)
    */
-  request->text ("authcID", _("Bind _ID"), info.authcID, _("User ID; leave blank for anonymous / nonauthenticated"));
-  request->private_text ("password", _("_Password"), info.password, _("The password for the user ID above, if any"));
+  request->text ("authcID", _("Bind _ID:"), info.authcID, _("User ID; leave blank for anonymous / nonauthenticated"));
+  request->private_text ("password", _("_Password:"), info.password, _("The password for the user ID above, if any"));
   request->boolean ("startTLS", _("Use TLS"), info.starttls);
   request->boolean ("sasl", _("Use SASL"), info.sasl);
   {
diff --git a/plugins/resource-list/rl-heap.cpp b/plugins/resource-list/rl-heap.cpp
index c881212..08c3240 100644
--- a/plugins/resource-list/rl-heap.cpp
+++ b/plugins/resource-list/rl-heap.cpp
@@ -464,13 +464,13 @@ RL::Heap::edit ()
   request->instructions (_("Please edit the following fields (no identifier"
 			   " means global)"));
 
-  request->text ("name", _("Contact list's name"), get_name (), std::string ());
+  request->text ("name", _("Contact list's name:"), get_name (), std::string ());
   /* "Document" used as a name -- uri point to the root of a document tree */
-  request->text ("root", _("Document root"), root_str, std::string ());
-  request->text ("user", _("Identifier"), user_str, std::string ());
-  request->boolean ("writable", _("Writable"), writable);
-  request->text ("username", _("Server username"), username_str, std::string ());
-  request->private_text ("password", _("Server password"), password_str, std::string ());
+  request->text ("root", _("Document root:"), root_str, std::string ());
+  request->text ("user", _("Identifier:"), user_str, std::string ());
+  request->boolean ("writable", _("Writable:"), writable);
+  request->text ("username", _("Server username:"), username_str, std::string ());
+  request->private_text ("password", _("Server password:"), password_str, std::string ());
 
   questions (request);
 }