[ekiga] Fix English errors

[Eugen Dedu <ededu src gnome org>]

commit 27616b1323aa8095d357f27b1394767373e41703
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Jul 18 16:19:35 2011 +0200

    Fix English errors
    
    Thanks to Kilian Krause and debian lintian.

 ekiga.schemas.in.in                                |    8 ++++----
 .../videooutput-manager-common.h                   |    2 +-
 lib/engine/components/opal/opal-gmconf-bridge.cpp  |    6 +++---
 .../x-videooutput/videooutput-manager-x.cpp        |    8 ++++----
 src/gui/conf.cpp                                   |    5 +++++
 src/gui/preferences.cpp                            |    2 +-
 6 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/ekiga.schemas.in.in b/ekiga.schemas.in.in
index a8b9376..a237f07 100644
--- a/ekiga.schemas.in.in
+++ b/ekiga.schemas.in.in
@@ -178,14 +178,14 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancelation</key>
-      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancelation</applyto>
+      <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancellation</key>
+      <applyto>/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancellation</applyto>
       <owner>Ekiga</owner>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-	<short>Enable echo cancelation</short>
-	<long>If enabled, use echo cancelation</long>
+	<short>Enable echo cancellation</short>
+	<long>If enabled, use echo cancellation</long>
       </locale>
     </schema>
     <schema>
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.h b/lib/engine/components/common-videooutput/videooutput-manager-common.h
index fc0e430..dfeb59d 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.h
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.h
@@ -65,7 +65,7 @@
    * accesses to a specific window not only have to be thread-safe, but also have to
    * come all from the same thread). The main task of that thread is to wait for triggers
    * and then act on them, the thread itself will be active for the whole lifetime of Ekiga.
-   * A call to open() from the core will signal the thread to execute the initalize function,
+   * A call to open() from the core will signal the thread to execute the initialize function,
    * with open() blocking until the thread has finished its task. 
    * The thread is now ready to accept frames, which will arrive from the core via
    * set_frame_data(). set_frame_data will make a local copy of the image via memcpy,
diff --git a/lib/engine/components/opal/opal-gmconf-bridge.cpp b/lib/engine/components/opal/opal-gmconf-bridge.cpp
index d593fad..f7e5430 100644
--- a/lib/engine/components/opal/opal-gmconf-bridge.cpp
+++ b/lib/engine/components/opal/opal-gmconf-bridge.cpp
@@ -79,7 +79,7 @@ ConfBridge::ConfBridge (Ekiga::Service & _service)
   keys.push_back (PORTS_KEY "tcp_port_range");
 
   keys.push_back (AUDIO_CODECS_KEY "enable_silence_detection");
-  keys.push_back (AUDIO_CODECS_KEY "enable_echo_cancelation");
+  keys.push_back (AUDIO_CODECS_KEY "enable_echo_cancellation");
 
   keys.push_back (AUDIO_CODECS_KEY "media_list");
   keys.push_back (VIDEO_CODECS_KEY "media_list");
@@ -199,9 +199,9 @@ void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
 
 
   //
-  // Echo cancelation
+  // Echo cancellation
   //
-  else if (key == AUDIO_CODECS_KEY "enable_echo_cancelation") {
+  else if (key == AUDIO_CODECS_KEY "enable_echo_cancellation") {
 
     manager.set_echo_cancellation (gm_conf_entry_get_bool (entry));
   }
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
index 209c210..286d71a 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
@@ -175,7 +175,7 @@ GMVideoOutputManager_x::setup_frame_display ()
     if (current_frame.accel == Ekiga::VO_ACCEL_NONE) {
       PTRACE(3, "GMVideoOutputManager_X\tFalling back to SW" << ((local_display_info.disable_hw_accel) 
                                       ? " since HW acceleration was deactivated by configuration" 
-                                      : " since HW acceleration failed to initalize"));
+                                      : " since HW acceleration failed to initialize"));
       lxWindow = new XWindow ();
       if (lxWindow->Init (lDisplay, 
                             local_display_info.window, 
@@ -237,7 +237,7 @@ GMVideoOutputManager_x::setup_frame_display ()
     if (current_frame.accel == Ekiga::VO_ACCEL_NONE) {
       PTRACE(3, "GMVideoOutputManager_X\tFalling back to SW" << ((local_display_info.disable_hw_accel) 
                                       ? " since HW acceleration was deactivated by configuration" 
-                                      : " since HW acceleration failed to initalize"));
+                                      : " since HW acceleration failed to initialize"));
       rxWindow = new XWindow ();
       if ( rxWindow->Init (rDisplay, 
                              local_display_info.window, 
@@ -303,7 +303,7 @@ GMVideoOutputManager_x::setup_frame_display ()
     if (current_frame.accel == Ekiga::VO_ACCEL_NONE) {
       PTRACE(3, "GMVideoOutputManager_X\tFalling back to SW" << ((local_display_info.disable_hw_accel) 
                                       ? " since HW acceleration was deactivated by configuration" 
-                                      : " since HW acceleration failed to initalize"));
+                                      : " since HW acceleration failed to initialize"));
       rxWindow = new XWindow ();
       if (rxWindow->Init ( rDisplay, 
                              (current_frame.mode == Ekiga::VO_MODE_PIP) ? local_display_info.window : DefaultRootWindow (rDisplay), 
@@ -354,7 +354,7 @@ GMVideoOutputManager_x::setup_frame_display ()
     if ((current_frame.accel != Ekiga::VO_ACCEL_ALL) && (local_display_info.allow_pip_sw_scaling)) {
       PTRACE(3, "GMVideoOutputManager_X\tFalling back to SW" << ((local_display_info.disable_hw_accel) 
                                       ? " since HW acceleration was deactivated by configuration" 
-                                      : " since HW acceleration failed to initalize"));
+                                      : " since HW acceleration failed to initialize"));
       lxWindow = new XWindow ();
       if (lxWindow->Init ( lDisplay, 
                              rxWindow->GetWindowHandle (),
diff --git a/src/gui/conf.cpp b/src/gui/conf.cpp
index 3afeaef..7b13fcb 100644
--- a/src/gui/conf.cpp
+++ b/src/gui/conf.cpp
@@ -175,4 +175,9 @@ gnomemeeting_conf_upgrade ()
   if (version >= 3020 && version < 3030)
     gm_conf_set_bool (NAT_KEY "enable_stun",
                       ! gm_conf_get_bool (NAT_KEY "disable_stun"));
+
+  // migrate from cancelation to cancellation
+  if (version <= 3031)
+    gm_conf_set_bool (AUDIO_CODECS_KEY "enable_echo_cancellation",
+                      gm_conf_get_bool (AUDIO_CODECS_KEY "enable_echo_cancelation"));
 }
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index 2b9205c..d9160a3 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -928,7 +928,7 @@ gm_pw_init_audio_codecs_page (GtkWidget *prefs_window,
      between X and Y ms */
   gnome_prefs_toggle_new (subsection, _("Enable silence _detection"), AUDIO_CODECS_KEY "enable_silence_detection", _("If enabled, use silence detection with the codecs supporting it"), 0);
 
-  gnome_prefs_toggle_new (subsection, _("Enable echo can_celation"), AUDIO_CODECS_KEY "enable_echo_cancelation", _("If enabled, use echo cancelation"), 1);
+  gnome_prefs_toggle_new (subsection, _("Enable echo can_celation"), AUDIO_CODECS_KEY "enable_echo_cancellation", _("If enabled, use echo cancellation"), 1);
 
   gnome_prefs_spin_new (subsection, _("Maximum _jitter buffer (in ms):"), AUDIO_CODECS_KEY "maximum_jitter_buffer", _("The maximum jitter buffer size for audio reception (in ms)"), 20.0, 2000.0, 50.0, 2, NULL, true);
 }