Merge lp:~mvo/software-center/webcam-string-fix into lp:software-center

[Michael Vogt]

Small fix to support the debtagshw updated tags for hardware::camera (split into webcam,digicam now)

[Gary Lasker (gary-lasker)]

Thanks mvo! Merging.

review: Approve

=== modified file 'softwarecenter/hw.py'
--- softwarecenter/hw.py	2012-02-22 15:22:56 +0000
+++ softwarecenter/hw.py	2012-03-02 10:14:19 +0000
@@ -19,7 +19,8 @@
 from gettext import gettext as _
 
 TAG_DESCRIPTION = {
-    'hardware::camera' : _('camera'),
+    'hardware::webcam' : _('webcam'),
+    'hardware::digicam' : _('digicam'),
     'hardware::input:mouse' : _('mouse'),
     'hardware::input:joystick' : _('joystick'),
     'hardware::input:touchscreen' : _('touchscreen'),
@@ -37,7 +38,9 @@
 }
 
 TAG_MISSING_DESCRIPTION = {
-    'hardware::camera' : _('This software requires a camera, but none '
+    'hardware::digicam' : _('This software requires a digital camera, but none '
+                           'are currently connected'),
+    'hardware::webcam' : _('This software requires a video camera, but none '
                            'are currently connected'),
     'hardware::input:mouse' : _('This software requires a mouse, '
                                 'but none is currently setup.'),