Merge lp:~pete-woods/camera-app/change-infographic-text into lp:camera-app

[Pete Woods]

Change the infographic text as per design request

Change the infographic text as per design request

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/camera-app-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1430
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1219

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/78/rebuild

review: Approve (continuous-integration)

=== modified file 'cameraapplication.cpp'
--- cameraapplication.cpp	2013-07-15 11:11:48 +0000
+++ cameraapplication.cpp	2013-07-22 16:16:29 +0000
@@ -102,8 +102,8 @@
 void CameraApplication::increaseTodaysPhotoMetrics()
 {
     MetricManagerPtr manager(MetricManager::getInstance());
-    MetricPtr metric(manager->add(PHOTO_STATISTICS_ID, "<b>%1</b> photos captured today",
-                        "No photo captured today", APP_ID));
+    MetricPtr metric(manager->add(PHOTO_STATISTICS_ID, "<b>%1</b> photos taken today",
+                        "No photos taken today", APP_ID));
     metric->increment();
 }
 
@@ -114,7 +114,7 @@
 void CameraApplication::increaseTodaysVideoMetrics()
 {
     MetricManagerPtr manager(MetricManager::getInstance());
-    MetricPtr metric(manager->add(VIDEO_STATISTICS_ID, "<b>%1</b> videos captured today",
-                        "No video captured today", APP_ID));
+    MetricPtr metric(manager->add(VIDEO_STATISTICS_ID, "<b>%1</b> videos recorded today",
+                        "No videos recorded today", APP_ID));
     metric->increment();
 }