Merge lp:~gang65/camera-app/camera-app-fix-plural-form into lp:camera-app

[Bartosz Kosiorek]

Fix plural form

Fix plural form

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:568
http://jenkins.qa.ubuntu.com/job/camera-app-ci/427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/123
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/234
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/624
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21344

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

review: Needs Fixing (continuous-integration)

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-04-24 12:12:23 +0000
+++ camera-app.qml	2015-06-21 17:01:29 +0000
@@ -220,8 +220,10 @@
     Metric {
         id: metricPhotos
         name: "camera-photos"
-        format: i18n.tr("<b>%1</b> photos taken today")
-        emptyFormat: i18n.tr("No photos taken today")
+        // Mark text for translation at a later point.
+        // It will be translated by dtr (or dgettext) to allows plural forms
+        format: i18n.tag("<b>%1</b> photos taken today")
+        emptyFormat: i18n.tag("No photos taken today")
         domain: "camera-app"
         minimum: 0.0
     }
@@ -229,8 +231,10 @@
     Metric {
         id: metricVideos
         name: "camera-videos"
-        format: i18n.tr("<b>%1</b> videos recorded today")
-        emptyFormat: i18n.tr("No videos recorded today")
+        // Mark text for translation at a later point.
+        // It will be translated by dtr (or dgettext) to allows plural forms
+        format: i18n.tag("<b>%1</b> videos recorded today")
+        emptyFormat: i18n.tag("No videos recorded today")
         domain: "camera-app"
         minimum: 0.0
     }

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-09-05 12:04:54 +0000
+++ po/CMakeLists.txt	2015-06-21 17:01:29 +0000
@@ -17,8 +17,11 @@
                           -D ${CMAKE_CURRENT_BINARY_DIR}
                           --from-code=UTF-8
                           --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=tr --keyword=N_ --keyword=tr:1,2
-                          --keyword=QT_TR_NOOP
+                          --keyword=tr 
+                          --keyword=N_ 
+                          --keyword=tr:1,2
+                          --keyword=QT_TR_NOOP 
+                          --keyword=tag
                           --package-name=camera-app
                           --copyright-holder='Canonical Ltd.'
                           ${I18N_SRC_FILES})

=== modified file 'po/camera-app.pot'
--- po/camera-app.pot	2015-02-23 19:00:52 +0000
+++ po/camera-app.pot	2015-06-21 17:01:29 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: camera-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 15:59-0300\n"
+"POT-Creation-Date: 2015-06-21 18:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,7 +25,7 @@
 msgid "Delete"
 msgstr ""
 
-#: ../DeleteDialog.qml:42 ../ViewFinderOverlay.qml:805
+#: ../DeleteDialog.qml:42 ../ViewFinderOverlay.qml:775
 msgid "Cancel"
 msgstr ""
 
@@ -65,63 +65,75 @@
 msgid "Edit"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:199 ../ViewFinderOverlay.qml:222
-#: ../ViewFinderOverlay.qml:250 ../ViewFinderOverlay.qml:273
-#: ../ViewFinderOverlay.qml:350
+#: ../ViewFinderOverlay.qml:200 ../ViewFinderOverlay.qml:223
+#: ../ViewFinderOverlay.qml:251 ../ViewFinderOverlay.qml:274
+#: ../ViewFinderOverlay.qml:351
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:42
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:65
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:86
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:42
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:65
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:86
 msgid "On"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:204 ../ViewFinderOverlay.qml:232
-#: ../ViewFinderOverlay.qml:255 ../ViewFinderOverlay.qml:278
-#: ../ViewFinderOverlay.qml:297 ../ViewFinderOverlay.qml:355
+#: ../ViewFinderOverlay.qml:205 ../ViewFinderOverlay.qml:233
+#: ../ViewFinderOverlay.qml:256 ../ViewFinderOverlay.qml:279
+#: ../ViewFinderOverlay.qml:298 ../ViewFinderOverlay.qml:356
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:47
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:70
+#: ../build/tests/unittests/tst_BottomEdgeIndicators.qml:91
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:47
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:70
+#: ../tests/unittests/tst_BottomEdgeIndicators.qml:91
 msgid "Off"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:227
+#: ../ViewFinderOverlay.qml:228
 msgid "Auto"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:264
+#: ../ViewFinderOverlay.qml:265
 msgid "HDR"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:302
+#: ../ViewFinderOverlay.qml:303
 msgid "5 seconds"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:307
+#: ../ViewFinderOverlay.qml:308
 msgid "15 seconds"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:324
+#: ../ViewFinderOverlay.qml:325
 msgid "Fine Quality"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:328
+#: ../ViewFinderOverlay.qml:329
 msgid "Normal Quality"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:332
+#: ../ViewFinderOverlay.qml:333
 msgid "Basic Quality"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:364
+#: ../ViewFinderOverlay.qml:365
 msgid "SD"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:372
+#: ../ViewFinderOverlay.qml:373
 msgid "Save to SD Card"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:377
+#: ../ViewFinderOverlay.qml:378
 msgid "Save internally"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:802
+#: ../ViewFinderOverlay.qml:772
 msgid "Low storage space"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:803
+#: ../ViewFinderOverlay.qml:773
 msgid ""
 "You are running out of storage space. To continue without interruptions, "
 "free up storage space now."
@@ -167,21 +179,21 @@
 msgid "Lighting Condition;Day;Cloudy;Inside"
 msgstr ""
 
-#: ../camera-app.qml:221
+#: ../camera-app.qml:225
 #, qt-format
 msgid "<b>%1</b> photos taken today"
 msgstr ""
 
-#: ../camera-app.qml:222
+#: ../camera-app.qml:226
 msgid "No photos taken today"
 msgstr ""
 
-#: ../camera-app.qml:230
+#: ../camera-app.qml:236
 #, qt-format
 msgid "<b>%1</b> videos recorded today"
 msgstr ""
 
-#: ../camera-app.qml:231
+#: ../camera-app.qml:237
 msgid "No videos recorded today"
 msgstr ""