Merge lp:~aacid/dialer-app/AllIsNotAll into lp:dialer-app

[Albert Astals Cid]

Use ctr instead of tr for "All"

So that we can have two translations "Todos" and "Todas" in the Spanish

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/493/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/397
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/397
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/397/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/249/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Could you please just revert the pot file changes? The pot file will be updated separately to avoid conflicting with other changes.

Other than that it looks good.

review: Needs Fixing

[lp:~aacid/dialer-app/AllIsNotAll]

325. By Albert Astals Cid on 2014-12-05

Revert pot changes as asked in review

[Albert Astals Cid (aacid)]

> Could you please just revert the pot file changes? The pot file will be
> updated separately to avoid conflicting with other changes.
>
> Other than that it looks good.

Done

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

[lp:~aacid/dialer-app/AllIsNotAll]

326. By Albert Astals Cid on 2015-01-28

Boiko asked for the debian/ changes to be reverted

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-08-25 17:47:53 +0000
+++ po/CMakeLists.txt	2015-01-28 15:36:17 +0000
@@ -38,6 +38,7 @@
               COMMAND ${XGETTEXT_EXECUTABLE}
                       --c++ --qt --add-comments=TRANSLATORS
                       --keyword=tr --keyword=tr:1,2 --keyword=N_
+                      --keyword=ctr:1c,2
                       -s -p ${CMAKE_CURRENT_SOURCE_DIR}
                       -o ${POT_FILE} ${I18N_SRCS}
                       -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
 
=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml	2014-12-11 18:30:52 +0000
+++ src/qml/ContactsPage/ContactsPage.qml	2015-01-28 15:36:17 +0000
@@ -69,7 +69,7 @@
             PropertyChanges {
                 target: contactsPage.head
                 actions: defaultState.actions
-                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
+                sections.model: [i18n.ctr("All Contacts", "All"), i18n.tr("Favorites")]
             }
             PropertyChanges {
                 target: searchField
 
=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2015-01-08 21:23:40 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2015-01-28 15:36:17 +0000
@@ -46,7 +46,7 @@
     active: false
     flickable: null
 
-    head.sections.model: [ i18n.tr("All"), i18n.tr("Missed") ]
+    head.sections.model: [ i18n.ctr("All Calls", "All"), i18n.tr("Missed") ]
 
     Rectangle {
         anchors.fill: parent