Merge lp:~m-alaa8/ubuntu/quantal/kubuntu-docs/fix-for-1066132 into lp:ubuntu/quantal/kubuntu-docs

[Mohamed Alaa]

[Logan Rosen (logan)]

This has already been done in lp:kubuntu-docs, which is the upstream branch and the correct target for this merge (furthermore, the XML should be edited directly, not the POT file).

review: Disapprove

Unmerged revisions

53. By Mohamed Alaa on 2012-10-14

Fix typo LP: #1066132

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-24 13:07:37 +0000
+++ debian/changelog	2012-10-14 19:13:18 +0000
@@ -1,3 +1,9 @@
+kubuntu-docs (12.10.1ubuntu1) quantal; urgency=low
+
+  * Fix typo LP: #1066132
+
+ -- Mohamed Alaa <[e-mail]>  Sun, 14 Oct 2012 22:06:27 +0300
+
 kubuntu-docs (12.10.1) quantal; urgency=low
 
   * Update to latest now we are in docs freeze

=== modified file 'docs/hardware/po/kubuntu-docs-hardware.pot'
--- docs/hardware/po/kubuntu-docs-hardware.pot	2012-09-24 13:07:37 +0000
+++ docs/hardware/po/kubuntu-docs-hardware.pot	2012-10-14 19:13:18 +0000
@@ -122,7 +122,7 @@
 msgstr ""
 
 #: docs/hardware/C/hardware.xml:80(para)
-msgid "<trademark>Kubuntu</trademark> ships with an application, developed by <trademark>Ubuntu</trademark> developers, which maintains proprietary drivers. This application is known as <application>Jockey</application>, and in <trademark>Kubuntu</trademark> is named <application>jockey-kde</application>. It can be opened by going to <menuchoice><guimenu>K menu</guimenu><guisubmenu>Applications</guisubmenu><guisubmenu>System</guisubmenu><guimenuitem>Hardware Deivers</guimenuitem></menuchoice>."
+msgid "<trademark>Kubuntu</trademark> ships with an application, developed by <trademark>Ubuntu</trademark> developers, which maintains proprietary drivers. This application is known as <application>Jockey</application>, and in <trademark>Kubuntu</trademark> is named <application>jockey-kde</application>. It can be opened by going to <menuchoice><guimenu>K menu</guimenu><guisubmenu>Applications</guisubmenu><guisubmenu>System</guisubmenu><guimenuitem>Hardware Drivers</guimenuitem></menuchoice>."
 msgstr ""
 
 #: docs/hardware/C/hardware.xml:86(title)