Merge lp:~cldunlap1/ubuntu/oneiric/kubuntu-docs/fix-for-825807-2 into lp:ubuntu/oneiric/kubuntu-docs

[Chad Dunlap]

made the typo correction to development/po/development.pot and development/C/development.xml. Changed 'Currentlyu' to 'Currently'

[David Wonderly (david.wonderly)]

Approved and merging.

review: Approve

[David Wonderly (david.wonderly)]

review: Approve

[Scott Moser (smoser)]

> Approved and merging.

Did you merge this somewhere? I dont see it at lp:ubuntu/oneiric/kubuntu-docs .

[Jonathan Riddell (jr)]

It's in https://code.launchpad.net/~ubuntu-core-doc/kubuntu-docs/oneiric ready for a SRU upload

[Stéphane Graber (stgraber)]

Marking branch as merged.

The change is fairly minimal and so doesn't justify an SRU upload now. As it's now in the packaging branch, it'll be part of the next SRU upload.

Marking it as merged will make this item go away from our sponsoring list.

Thanks for your contribution!

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-15 04:02:48 +0000
+++ debian/changelog	2011-10-04 18:08:25 +0000
@@ -1,3 +1,9 @@
+kubuntu-docs (11.10ubuntu2) natty; urgency=low
+
+  * fixed a typo in development/C/development.xml and in development/po/development.pot (LP: #825807) 
+
+ -- Chad Dunlap <[e-mail]>  Tue, 04 Oct 2011 14:02:18 -0400
+
 kubuntu-docs (11.10ubuntu1) oneiric; urgency=low
 
   * Build to sent for translations.

=== modified file 'docs/development/C/development.xml'
--- docs/development/C/development.xml	2011-04-16 20:20:52 +0000
+++ docs/development/C/development.xml	2011-10-04 18:08:25 +0000
@@ -300,7 +300,7 @@
 <application>Monkey Studio (MkS)</application> is a cross platform IDE written in C++/Qt 4.  Its primary goal was to be a Qt 4 only IDE,  but it evolved beyond only Qt development.   The current version is the v2 branch which succeeded the v1 branch and is dependent on Qt 4.4.0 or greater.  It supports Qt 4 projects management and embeds Designer and Assistant to form a complete, fast and power full Qt 4 IDE.  
 </para>
 <para>
-<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways.  Currentlyu there are a lot of  plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python).
+<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways.  Currently there are a lot of  plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python).
 </para>
 <para>
 Monkey Studio is released under the GPL. Its based on Qt 4.4.x and higher, and is working on Linux, Windows and Mac.   

=== modified file 'docs/development/po/development.pot'
--- docs/development/po/development.pot	2011-09-15 04:02:48 +0000
+++ docs/development/po/development.pot	2011-10-04 18:08:25 +0000
@@ -438,7 +438,7 @@
 msgstr ""
 
 #: ../docs/development/C/development.xml:302(para)
-msgid "<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways. Currentlyu there are a lot of plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python)."
+msgid "<acronym>MkS</acronym> is based upon a powerful and flexible plugin system that allows it to be extended in infinite ways. Currently there are a lot of plugins, including PHP-Qt (Qt4 bindings for PHP) and PyQt (Qt4 bindings for Python)."
 msgstr ""
 
 #: ../docs/development/C/development.xml:305(para)