[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-41-g3203194

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 182e1b46c6a664a3039a1aae966f955551f64682
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Apr 22 20:13:30 2012 -0400

    0009-spelling-bach.patch: fix spelling mistake

diff --git a/debian/changelog b/debian/changelog
index e4fd67e..fca9ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ ember (0.6.2-1) unstable; urgency=low
   * debian/copyright: changed to computer-readable format (DEP-5)
   * 0008-replace-fastdeletegate-with-boost.patch: replaced FastDelegate
     - used GPL-compatible boost::function instead
+  * 0009-spelling-bach.patch: fix spelling mistake
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 10 Apr 2012 15:05:18 -0400
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 22 Apr 2012 20:12:45 -0400
 
 ember (0.5.7-1.1) unstable; urgency=high
 
diff --git a/debian/patches/0009-spelling-bach.patch b/debian/patches/0009-spelling-bach.patch
new file mode 100644
index 0000000..03bb492
--- /dev/null
+++ b/debian/patches/0009-spelling-bach.patch
@@ -0,0 +1,15 @@
+Description: Fixes a spelling mistake in a dialog text.
+Author: Stephen M. Webb <stephen.web at bregmasoft.ca>
+Bug: https://bugs.launchpad.net/ember/+bug/987047
+
+--- a/src/components/ogre/widgets/IngameChatWidget.cpp
++++ b/src/components/ogre/widgets/IngameChatWidget.cpp
+@@ -716,7 +716,7 @@
+ 	// reset the fade timer
+ 	mElapsedTimeSinceLastUpdate = 0;
+ 
+-	QuickHelp::getSingleton().updateText(HelpMessage("You have switched to detached chat mode", "This allows you to concentrate on dialog from this particular person/entity as well as drag the chat history wherever you please. To switch bach to attached mode, close the frame window with the dialog", "ingame chat widget", "ingameChatWidgetDetached"));
++	QuickHelp::getSingleton().updateText(HelpMessage("You have switched to detached chat mode", "This allows you to concentrate on dialog from this particular person/entity as well as drag the chat history wherever you please. To switch back to attached mode, close the frame window with the dialog", "ingame chat widget", "ingameChatWidgetDetached"));
+ }
+ 
+ bool IngameChatWidget::ChatText::buttonResponse_Click(const EventArgs& args)
diff --git a/debian/patches/series b/debian/patches/series
index 960510a..184e256 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-spellcheck-similiar.patch
 0007-revert-libwfut-version.patch
 0008-replace-fastdeletegate-with-boost.patch
+0009-spelling-bach.patch

-- 
WorldForge 3D client