Merge lp:~pitti/messaging-app/i18n-fixes into lp:messaging-app

[Martin Pitt]

Do not mark single space for translation, and fix wrong macros in plural forms of "Attachments" strings.

Fix i18n issues, see commit logs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3988
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3459/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2014-08-12 15:14:25 +0000
+++ src/qml/MainPage.qml	2014-08-28 05:36:01 +0000
@@ -34,7 +34,7 @@
     }
 
     state: selectionMode ? "select" : searching ? "search" : "default"
-    title: selectionMode ? i18n.tr(" ") : i18n.tr("Chats")
+    title: selectionMode ? " " : i18n.tr("Chats")
 
     bottomEdgeEnabled: !selectionMode && !searching
     bottomEdgePageComponent: Messages {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-08-20 15:34:00 +0000
+++ src/qml/Messages.qml	2014-08-28 05:36:01 +0000
@@ -113,7 +113,7 @@
 
     title: {
         if (selectionMode) {
-            return i18n.tr(" ")
+            return " "
         }
 
         if (landscape) {

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2014-08-12 15:14:25 +0000
+++ src/qml/ThreadDelegate.qml	2014-08-28 05:36:01 +0000
@@ -65,16 +65,16 @@
         attachmentCount = imageCount + videoCount + contactCount
 
         if (imageCount > 0 && attachmentCount == imageCount) {
-            return i18n.tr("Attachment: %1 image", "Attachments: %s images").arg(imageCount)
+            return i18n.tr("Attachment: %1 image", "Attachments: %1 images").arg(imageCount)
         }
         if (videoCount > 0 && attachmentCount == videoCount) {
-            return i18n.tr("Attachment: %1 video", "Attachments: %s videos").arg(videoCount)
+            return i18n.tr("Attachment: %1 video", "Attachments: %1 videos").arg(videoCount)
         }
         if (contactCount > 0 && attachmentCount == contactCount) {
-            return i18n.tr("Attachment: %1 contact", "Attachments: %s contacts").arg(contactCount)
+            return i18n.tr("Attachment: %1 contact", "Attachments: %1 contacts").arg(contactCount)
         }
         if (attachmentCount > 0) {
-            return i18n.tr("Attachment: %1 file", "Attachments: %s files").arg(attachmentCount)
+            return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
         }
         return eventTextMessage
     }