Merge lp:~seb128/dialer-app/tweak-some-strings into lp:dialer-app

[Sebastien Bacher]

Use "Phone" rather than "Keypad" for the default title, as recommended by
design.
Change "Flight Mode" to use proper casing

Use "Phone" rather than "Keypad" for the default title, as recommended by
design.
Change "Flight Mode" to use proper casing

[lp:~seb128/dialer-app/tweak-some-strings]

436. By Sebastien Bacher on 2015-07-17

Use "Phone" rather than "Keypad" for the default title, as recommended by
design.
Change "Flight Mode" to use proper casing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/582/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21936

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2015-06-18 20:01:19 +0000
+++ src/qml/DialerPage/DialerPage.qml	2015-07-17 09:01:55 +0000
@@ -74,15 +74,13 @@
                 return " "
             }
         } else if (telepathyHelper.flightMode) {
-            return i18n.tr("Flight mode")
+            return i18n.tr("Flight Mode")
         } else if (mainView.account && mainView.account.simLocked) {
             return i18n.tr("SIM Locked")
         } else if (mainView.account && mainView.account.networkName != "") {
             return mainView.account.networkName
         } else if (multipleAccounts && !mainView.account) {
-            // TODO: check what should be displayed when there are multiple accounts
-            // but no default selected
-            return i18n.tr("Keypad")
+            return i18n.tr("Phone")
         }
         return i18n.tr("No network")
     }