Merge lp:~seb128/ubuntu-system-settings/language-punctuation-description-vivid into lp:ubuntu-system-settings/15.04

[Sebastien Bacher]

[language] update auto punctuation description to match the osk behaviour

[language] update auto punctuation description to match the osk behaviour

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1418
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3122
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21052

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-15.04-ci/5/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

WFM

review: Approve

=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2014-11-04 12:08:12 +0000
+++ plugins/language/PageComponent.qml	2015-06-09 14:15:00 +0000
@@ -205,7 +205,8 @@
             }
 
             ListItem.Caption {
-                text: i18n.tr("Adds a period, and any missing quotes or brackets, when you tap Space twice.")
+                /* TODO: update the string to mention quotes/brackets once the osk does that */
+                text: i18n.tr("Inserts a period when you tap Space twice.")
             }
 
             ListItem.ThinDivider {