[ekiga] Fix prefered and voicemail spelling

[Eugen Dedu <ededu src gnome org>]

commit deef8979bb172f498e7113f37ad59f28facd817d
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Jun 9 14:13:18 2010 +0200

    Fix prefered and voicemail spelling
    
    Fixes bug 612109.

 lib/engine/components/local-roster/local-heap.cpp  |    2 +-
 .../components/local-roster/local-presentity.cpp   |   24 ++++++++++----------
 .../components/local-roster/local-presentity.h     |    6 ++--
 lib/engine/components/opal/opal-account.cpp        |    6 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/lib/engine/components/local-roster/local-heap.cpp b/lib/engine/components/local-roster/local-heap.cpp
index a5089f2..cc8f7f0 100644
--- a/lib/engine/components/local-roster/local-heap.cpp
+++ b/lib/engine/components/local-roster/local-heap.cpp
@@ -478,7 +478,7 @@ Local::Heap::decide (const std::string /*domain*/,
 
     if ((*iter)->get_uri () == token) {
 
-      if ((*iter)->is_prefered ()) {
+      if ((*iter)->is_preferred ()) {
 
 	result = Ekiga::FriendOrFoe::Friend;
       } else {
diff --git a/lib/engine/components/local-roster/local-presentity.cpp b/lib/engine/components/local-roster/local-presentity.cpp
index b2d4a78..6749357 100644
--- a/lib/engine/components/local-roster/local-presentity.cpp
+++ b/lib/engine/components/local-roster/local-presentity.cpp
@@ -73,7 +73,7 @@ Local::Presentity::Presentity (Ekiga::ServiceCore &_core,
 {
   node = xmlNewNode (NULL, BAD_CAST "entry");
   xmlSetProp (node, BAD_CAST "uri", BAD_CAST uri.c_str ());
-  xmlSetProp (node, BAD_CAST "prefered", BAD_CAST "false");
+  xmlSetProp (node, BAD_CAST "preferred", BAD_CAST "false");
   xmlNewChild (node, NULL,
 	       BAD_CAST "name",
 	       BAD_CAST robust_xmlEscape (node->doc,
@@ -244,7 +244,7 @@ Local::Presentity::edit_presentity ()
 			   "element of ekiga's internal roster"));
   request->text ("name", _("Name:"), name);
   request->text ("uri", _("Address:"), uri);
-  request->boolean ("prefered", _("Is a prefered contact"), is_prefered ());
+  request->boolean ("preferred", _("Is a preferred contact"), is_preferred ());
 
   request->editable_set ("groups", _("Choose groups:"),
 			 groups, all_groups);
@@ -265,7 +265,7 @@ Local::Presentity::edit_presentity_form_submitted (bool submitted,
   const std::set<std::string> new_groups = result.editable_set ("groups");
   std::string new_uri = result.text ("uri");
   const std::string uri = get_uri ();
-  bool prefered = result.boolean ("prefered");
+  bool preferred = result.boolean ("preferred");
   std::set<xmlNodePtr> nodes_to_remove;
   size_t pos = new_uri.find_first_of (' ');
   if (pos != std::string::npos)
@@ -339,12 +339,12 @@ Local::Presentity::edit_presentity_form_submitted (bool submitted,
     }
   }
 
-  if (prefered) {
+  if (preferred) {
 
-    xmlSetProp (node, BAD_CAST "prefered", BAD_CAST "true");
+    xmlSetProp (node, BAD_CAST "preferred", BAD_CAST "true");
   } else {
 
-    xmlSetProp (node, BAD_CAST "prefered", BAD_CAST "false");
+    xmlSetProp (node, BAD_CAST "preferred", BAD_CAST "false");
   }
 
   updated ();
@@ -428,22 +428,22 @@ Local::Presentity::remove ()
 }
 
 bool
-Local::Presentity::is_prefered () const
+Local::Presentity::is_preferred () const
 {
-  bool prefered = false;
-  xmlChar* xml_str = xmlGetProp (node, (const xmlChar*)"prefered");
+  bool preferred = false;
+  xmlChar* xml_str = xmlGetProp (node, (const xmlChar*)"preferred");
 
   if (xml_str != NULL) {
 
     if (xmlStrEqual (xml_str, BAD_CAST "true")) {
 
-      prefered = true;
+      preferred = true;
     } else {
 
-      prefered = false;
+      preferred = false;
     }
     xmlFree (xml_str);
   }
 
-  return prefered;
+  return preferred;
 }
diff --git a/lib/engine/components/local-roster/local-presentity.h b/lib/engine/components/local-roster/local-presentity.h
index 835116f..481224d 100644
--- a/lib/engine/components/local-roster/local-presentity.h
+++ b/lib/engine/components/local-roster/local-presentity.h
@@ -132,11 +132,11 @@ namespace Local
     xmlNodePtr get_node () const;
 
 
-    /** Tells if the contact is in the prefered list
+    /** Tells if the contact is in the preferred list
      *
-     * @return: Whether the contact is prefered
+     * @return: Whether the contact is preferred
      */
-    bool is_prefered () const;
+    bool is_preferred () const;
 
     /** Rename the given group, if this Presentity belongs to it
      *
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 6abd5c2..f959173 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -204,10 +204,10 @@ Opal::Account::get_status () const
 
     gchar* str = NULL;
     /* translators : the result will look like :
-     * "registered (with 2 voicemail messages)"
+     * "registered (with 2 voice mail messages)"
      */
-    str = g_strdup_printf (ngettext ("%s (with %d voicemail message)",
-				     "%s (with %d voicemail messages)",
+    str = g_strdup_printf (ngettext ("%s (with %d voice mail message)",
+				     "%s (with %d voice mail messages)",
 				     message_waiting_number),
 			   status.c_str (), message_waiting_number);
     result = str;