Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1421411 into lp:ubuntu-keyboard

[Michael Sheldon]

Add punctuation to extended keys and make comma key more consistent across shift states

Add punctuation to extended keys and make comma key more consistent across shift states

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/556/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1379/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/57
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1217/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18092

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/556/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

going to hold off landing this until we fix the issue with the extended keys being shifted by Qt5.4 as it makes it quite apparent with these extra keys

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:323
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/fix-1421411/+merge/252583/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/565/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1725/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/66
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1530/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18758

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/565/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1421411]

324. By Michael Sheldon on 2015-03-11

Fix extended key sliding tests across different devices

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/567/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/68
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1738
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1738/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18780

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/567/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:324
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/537/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/537/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/5/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

324. By Michael Sheldon on 2015-03-11

Fix extended key sliding tests across different devices

323. By Michael Sheldon on 2015-03-11

Add tests for additional punctuation on extended keys (and sliding through extended keys in general)

322. By Michael Sheldon on 2015-03-10

Merge fix-extended-key-ordering branch

321. By Michael Sheldon on 2015-03-10

Merge from trunk

=== modified file 'plugins/ar/qml/Keyboard_ar.qml'
--- plugins/ar/qml/Keyboard_ar.qml	2014-09-26 13:22:23 +0000
+++ plugins/ar/qml/Keyboard_ar.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: commaKey;    label: "ذ"; shifted: "/";  anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; }
             CharKey        { id: specialChar; label: "ط";                anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/ar/qml/Keyboard_ar_email.qml'
--- plugins/ar/qml/Keyboard_ar_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/ar/qml/Keyboard_ar_email.qml	2015-03-11 23:05:35 +0000
@@ -91,7 +91,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; }
             CharKey        { id: specialChar; label: "ط";                anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/ar/qml/Keyboard_ar_url.qml'
--- plugins/ar/qml/Keyboard_ar_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/ar/qml/Keyboard_ar_url.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; }
             CharKey        { id: specialChar; label: "ط";                anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/ar/qml/Keyboard_ar_url_search.qml'
--- plugins/ar/qml/Keyboard_ar_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/ar/qml/Keyboard_ar_url_search.qml	2015-03-11 23:05:35 +0000
@@ -93,7 +93,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".eg"; extended: [".com", ".iq", ".lb", ".sa", ".sy", ".jo", ".ye"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: specialChar.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "ذ"; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: specialChar.left; height: parent.height; }
             CharKey        { id: specialChar; label: "ط";                anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/az/qml/Keyboard_az.qml'
--- plugins/az/qml/Keyboard_az.qml	2014-11-14 16:53:41 +0000
+++ plugins/az/qml/Keyboard_az.qml	2015-03-11 23:05:35 +0000
@@ -89,9 +89,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/az/qml/Keyboard_az_email.qml'
--- plugins/az/qml/Keyboard_az_email.qml	2014-11-14 16:53:41 +0000
+++ plugins/az/qml/Keyboard_az_email.qml	2015-03-11 23:05:35 +0000
@@ -92,7 +92,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/az/qml/Keyboard_az_url.qml'
--- plugins/az/qml/Keyboard_az_url.qml	2014-11-14 16:53:41 +0000
+++ plugins/az/qml/Keyboard_az_url.qml	2015-03-11 23:05:35 +0000
@@ -91,7 +91,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/az/qml/Keyboard_az_url_search.qml'
--- plugins/az/qml/Keyboard_az_url_search.qml	2014-11-14 16:53:41 +0000
+++ plugins/az/qml/Keyboard_az_url_search.qml	2015-03-11 23:05:35 +0000
@@ -93,7 +93,7 @@
             CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/bs/qml/Keyboard_bs.qml'
--- plugins/bs/qml/Keyboard_bs.qml	2014-10-24 14:42:34 +0000
+++ plugins/bs/qml/Keyboard_bs.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/bs/qml/Keyboard_bs_email.qml'
--- plugins/bs/qml/Keyboard_bs_email.qml	2014-10-24 21:49:09 +0000
+++ plugins/bs/qml/Keyboard_bs_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/bs/qml/Keyboard_bs_url.qml'
--- plugins/bs/qml/Keyboard_bs_url.qml	2014-10-24 21:49:09 +0000
+++ plugins/bs/qml/Keyboard_bs_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/bs/qml/Keyboard_bs_url_search.qml'
--- plugins/bs/qml/Keyboard_bs_url_search.qml	2014-11-14 16:50:54 +0000
+++ plugins/bs/qml/Keyboard_bs_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ca/qml/Keyboard_ca.qml'
--- plugins/ca/qml/Keyboard_ca.qml	2015-02-13 06:28:21 +0000
+++ plugins/ca/qml/Keyboard_ca.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'","-",";",":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!","-", "_", "+", "%","#","/", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ca/qml/Keyboard_ca_email.qml'
--- plugins/ca/qml/Keyboard_ca_email.qml	2015-02-13 06:43:48 +0000
+++ plugins/ca/qml/Keyboard_ca_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!","-", "_", "+", "%","#","/", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ca/qml/Keyboard_ca_url.qml'
--- plugins/ca/qml/Keyboard_ca_url.qml	2015-02-13 06:43:48 +0000
+++ plugins/ca/qml/Keyboard_ca_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?","!","-", "_", "+", "%","#","/", "·", "¿", "¡"];  extendedShifted: ["?","!",'"',"(",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/cs/qml/Keyboard_cs.qml'
--- plugins/cs/qml/Keyboard_cs.qml	2014-09-26 13:22:23 +0000
+++ plugins/cs/qml/Keyboard_cs.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
--- plugins/cs/qml/Keyboard_cs_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/cs/qml/Keyboard_cs_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".com", ".sk"];anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
--- plugins/cs/qml/Keyboard_cs_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/cs/qml/Keyboard_cs_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".com", ".sk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
--- plugins/cs/qml/Keyboard_cs_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/cs/qml/Keyboard_cs_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".cz"; extended: [".com", ".sk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/da/qml/Keyboard_da.qml'
--- plugins/da/qml/Keyboard_da.qml	2014-09-26 13:22:23 +0000
+++ plugins/da/qml/Keyboard_da.qml	2015-03-11 23:05:35 +0000
@@ -85,9 +85,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ø"; shifted: "Ø";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/da/qml/Keyboard_da_email.qml'
--- plugins/da/qml/Keyboard_da_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/da/qml/Keyboard_da_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ø"; shifted: "Ø";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/da/qml/Keyboard_da_url.qml'
--- plugins/da/qml/Keyboard_da_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/da/qml/Keyboard_da_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ø"; shifted: "Ø";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/da/qml/Keyboard_da_url_search.qml'
--- plugins/da/qml/Keyboard_da_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/da/qml/Keyboard_da_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".dk"; extended: [".com", ".fo", ".gl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ø"; shifted: "Ø";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/de/qml/Keyboard_de.qml'
--- plugins/de/qml/Keyboard_de.qml	2014-09-26 13:22:23 +0000
+++ plugins/de/qml/Keyboard_de.qml	2015-03-11 23:05:35 +0000
@@ -85,9 +85,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/de/qml/Keyboard_de_email.qml'
--- plugins/de/qml/Keyboard_de_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/de/qml/Keyboard_de_email.qml	2015-03-11 23:05:35 +0000
@@ -88,7 +88,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/de/qml/Keyboard_de_url.qml'
--- plugins/de/qml/Keyboard_de_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/de/qml/Keyboard_de_url.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/de/qml/Keyboard_de_url_search.qml'
--- plugins/de/qml/Keyboard_de_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/de/qml/Keyboard_de_url_search.qml	2015-03-11 23:05:35 +0000
@@ -88,7 +88,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".de"; extended: [".com", ".at", ".ch"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/en/qml/Keyboard_en.qml'
--- plugins/en/qml/Keyboard_en.qml	2014-09-26 13:22:23 +0000
+++ plugins/en/qml/Keyboard_en.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/en/qml/Keyboard_en_email.qml'
--- plugins/en/qml/Keyboard_en_email.qml	2014-09-26 15:49:22 +0000
+++ plugins/en/qml/Keyboard_en_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/en/qml/Keyboard_en_url.qml'
--- plugins/en/qml/Keyboard_en_url.qml	2014-09-26 13:22:23 +0000
+++ plugins/en/qml/Keyboard_en_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/en/qml/Keyboard_en_url_search.qml'
--- plugins/en/qml/Keyboard_en_url_search.qml	2014-09-26 13:22:23 +0000
+++ plugins/en/qml/Keyboard_en_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/es/qml/Keyboard_es.qml'
--- plugins/es/qml/Keyboard_es.qml	2014-09-26 13:22:23 +0000
+++ plugins/es/qml/Keyboard_es.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/es/qml/Keyboard_es_email.qml'
--- plugins/es/qml/Keyboard_es_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/es/qml/Keyboard_es_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/es/qml/Keyboard_es_url.qml'
--- plugins/es/qml/Keyboard_es_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/es/qml/Keyboard_es_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/es/qml/Keyboard_es_url_search.qml'
--- plugins/es/qml/Keyboard_es_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/es/qml/Keyboard_es_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".es"; extended: [".com", ".mx", ".co", ".ar", ".pe", ".ve", ".cl"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/fi/qml/Keyboard_fi.qml'
--- plugins/fi/qml/Keyboard_fi.qml	2014-09-26 13:22:23 +0000
+++ plugins/fi/qml/Keyboard_fi.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
             CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }

=== modified file 'plugins/fr/qml/Keyboard_fr.qml'
--- plugins/fr/qml/Keyboard_fr.qml	2014-09-26 13:22:23 +0000
+++ plugins/fr/qml/Keyboard_fr.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/fr/qml/Keyboard_fr_email.qml'
--- plugins/fr/qml/Keyboard_fr_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/fr/qml/Keyboard_fr_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/fr/qml/Keyboard_fr_url.qml'
--- plugins/fr/qml/Keyboard_fr_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/fr/qml/Keyboard_fr_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/fr/qml/Keyboard_fr_url_search.qml'
--- plugins/fr/qml/Keyboard_fr_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/fr/qml/Keyboard_fr_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".fr"; extended: [".com", ".ca", ".cd", ".ci", ".ch", ".be", ".ht"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/he/qml/Keyboard_he.qml'
--- plugins/he/qml/Keyboard_he.qml	2014-09-26 15:51:12 +0000
+++ plugins/he/qml/Keyboard_he.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", ";", ":", "׳", "״"]; extendedShifted: ["'", ";", ":", "׳", "״"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")", "׳", "״"]; extendedShifted: ["'", ";", ":", "׳", "״"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/", "־"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/", "־"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/he/qml/Keyboard_he_email.qml'
--- plugins/he/qml/Keyboard_he_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/he/qml/Keyboard_he_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/", "־"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/", "־"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/he/qml/Keyboard_he_url.qml'
--- plugins/he/qml/Keyboard_he_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/he/qml/Keyboard_he_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/", "־"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/", "־"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/he/qml/Keyboard_he_url_search.qml'
--- plugins/he/qml/Keyboard_he_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/he/qml/Keyboard_he_url_search.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".il"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "־"]; extendedShifted: ["?", "!", "־"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/", "־"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/", "־"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hr/qml/Keyboard_hr.qml'
--- plugins/hr/qml/Keyboard_hr.qml	2014-10-29 11:17:42 +0000
+++ plugins/hr/qml/Keyboard_hr.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hr/qml/Keyboard_hr_email.qml'
--- plugins/hr/qml/Keyboard_hr_email.qml	2014-10-29 11:17:42 +0000
+++ plugins/hr/qml/Keyboard_hr_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hr/qml/Keyboard_hr_url.qml'
--- plugins/hr/qml/Keyboard_hr_url.qml	2014-10-29 11:17:42 +0000
+++ plugins/hr/qml/Keyboard_hr_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml'
--- plugins/hr/qml/Keyboard_hr_url_search.qml	2014-11-14 16:50:54 +0000
+++ plugins/hr/qml/Keyboard_hr_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey;    label: "/"; shifted: "/";  anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hu/qml/Keyboard_hu.qml'
--- plugins/hu/qml/Keyboard_hu.qml	2014-09-26 13:22:23 +0000
+++ plugins/hu/qml/Keyboard_hu.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hu/qml/Keyboard_hu_email.qml'
--- plugins/hu/qml/Keyboard_hu_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/hu/qml/Keyboard_hu_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hu/qml/Keyboard_hu_url.qml'
--- plugins/hu/qml/Keyboard_hu_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/hu/qml/Keyboard_hu_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/hu/qml/Keyboard_hu_url_search.qml'
--- plugins/hu/qml/Keyboard_hu_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/hu/qml/Keyboard_hu_url_search.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".hu"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/it/qml/Keyboard_it.qml'
--- plugins/it/qml/Keyboard_it.qml	2014-09-26 13:22:23 +0000
+++ plugins/it/qml/Keyboard_it.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/it/qml/Keyboard_it_email.qml'
--- plugins/it/qml/Keyboard_it_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/it/qml/Keyboard_it_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/it/qml/Keyboard_it_url.qml'
--- plugins/it/qml/Keyboard_it_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/it/qml/Keyboard_it_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/it/qml/Keyboard_it_url_search.qml'
--- plugins/it/qml/Keyboard_it_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/it/qml/Keyboard_it_url_search.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".it"; extended: [".com", ".ch", ".va", ".sm"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/nl/qml/Keyboard_nl.qml'
--- plugins/nl/qml/Keyboard_nl.qml	2014-09-26 13:22:23 +0000
+++ plugins/nl/qml/Keyboard_nl.qml	2015-03-11 23:05:35 +0000
@@ -83,9 +83,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/nl/qml/Keyboard_nl_email.qml'
--- plugins/nl/qml/Keyboard_nl_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/nl/qml/Keyboard_nl_email.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/nl/qml/Keyboard_nl_url.qml'
--- plugins/nl/qml/Keyboard_nl_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/nl/qml/Keyboard_nl_url.qml	2015-03-11 23:05:35 +0000
@@ -85,7 +85,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/nl/qml/Keyboard_nl_url_search.qml'
--- plugins/nl/qml/Keyboard_nl_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/nl/qml/Keyboard_nl_url_search.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pl/qml/Keyboard_pl.qml'
--- plugins/pl/qml/Keyboard_pl.qml	2014-09-26 13:22:23 +0000
+++ plugins/pl/qml/Keyboard_pl.qml	2015-03-11 23:05:35 +0000
@@ -87,9 +87,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pl/qml/Keyboard_pl_email.qml'
--- plugins/pl/qml/Keyboard_pl_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/pl/qml/Keyboard_pl_email.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pl/qml/Keyboard_pl_url.qml'
--- plugins/pl/qml/Keyboard_pl_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/pl/qml/Keyboard_pl_url.qml	2015-03-11 23:05:35 +0000
@@ -89,7 +89,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pl/qml/Keyboard_pl_url_search.qml'
--- plugins/pl/qml/Keyboard_pl_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/pl/qml/Keyboard_pl_url_search.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".pl"; extended: [".com"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pt/qml/Keyboard_pt.qml'
--- plugins/pt/qml/Keyboard_pt.qml	2014-09-26 13:22:23 +0000
+++ plugins/pt/qml/Keyboard_pt.qml	2015-03-11 23:05:35 +0000
@@ -84,9 +84,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pt/qml/Keyboard_pt_email.qml'
--- plugins/pt/qml/Keyboard_pt_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/pt/qml/Keyboard_pt_email.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pt/qml/Keyboard_pt_url.qml'
--- plugins/pt/qml/Keyboard_pt_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/pt/qml/Keyboard_pt_url.qml	2015-03-11 23:05:35 +0000
@@ -86,7 +86,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/pt/qml/Keyboard_pt_url_search.qml'
--- plugins/pt/qml/Keyboard_pt_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/pt/qml/Keyboard_pt_url_search.qml	2015-03-11 23:05:35 +0000
@@ -87,7 +87,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".com.br"; extended: [".com", ".pt", ".mz", ".ao", ".gw", ".tl"]; anchors.right: dotKey.left; height: parent.height; width: panel.keyWidth + units.gu(UI.emailLayoutUrlKeyPadding + 0.5); }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ru/qml/Keyboard_ru.qml'
--- plugins/ru/qml/Keyboard_ru.qml	2014-09-26 13:22:23 +0000
+++ plugins/ru/qml/Keyboard_ru.qml	2015-03-11 23:05:35 +0000
@@ -89,9 +89,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;       label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;       label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ru/qml/Keyboard_ru_email.qml'
--- plugins/ru/qml/Keyboard_ru_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/ru/qml/Keyboard_ru_email.qml	2015-03-11 23:05:35 +0000
@@ -91,7 +91,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф",".укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: ".";  extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: ".";  extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ru/qml/Keyboard_ru_url.qml'
--- plugins/ru/qml/Keyboard_ru_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/ru/qml/Keyboard_ru_url.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/ru/qml/Keyboard_ru_url_search.qml'
--- plugins/ru/qml/Keyboard_ru_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/ru/qml/Keyboard_ru_url_search.qml	2015-03-11 23:05:35 +0000
@@ -91,7 +91,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".ru"; extended: [".com", ".ua",".su",".kg",".рф","укр",".by",".tj"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/sr/qml/Keyboard_sr.qml'
--- plugins/sr/qml/Keyboard_sr.qml	2014-09-26 13:22:23 +0000
+++ plugins/sr/qml/Keyboard_sr.qml	2015-03-11 23:05:35 +0000
@@ -68,7 +68,7 @@
             spacing: 0
 
             ShiftKey { }
-            CharKey { label: ","; shifted: "/"; }
+            CharKey { label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; }
             CharKey { label: "џ"; shifted: "Џ"; }
             CharKey { label: "ц"; shifted: "Ц"; }
             CharKey { label: "в"; shifted: "В"; }
@@ -76,7 +76,7 @@
             CharKey { label: "н"; shifted: "Н"; }
             CharKey { label: "м"; shifted: "М"; }
             CharKey { label: "ж"; shifted: "Ж"; }
-            CharKey { label: "."; shifted: "."; }
+            CharKey { label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; }
             BackspaceKey { }
         }
 

=== modified file 'plugins/sr/qml/Keyboard_sr_email.qml'
--- plugins/sr/qml/Keyboard_sr_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/sr/qml/Keyboard_sr_email.qml	2015-03-11 23:05:35 +0000
@@ -77,7 +77,7 @@
             CharKey { label: "н"; shifted: "Н"; }
             CharKey { label: "м"; shifted: "М"; }
             CharKey { label: "ж"; shifted: "Ж"; }
-            CharKey { label: "."; shifted: "."; }
+            CharKey { label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; }
             BackspaceKey { }
         }
 

=== modified file 'plugins/sr/qml/Keyboard_sr_url.qml'
--- plugins/sr/qml/Keyboard_sr_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/sr/qml/Keyboard_sr_url.qml	2015-03-11 23:05:35 +0000
@@ -77,7 +77,7 @@
             CharKey { label: "н"; shifted: "Н"; }
             CharKey { label: "м"; shifted: "М"; }
             CharKey { label: "ж"; shifted: "Ж"; }
-            CharKey { label: "."; shifted: "."; }
+            CharKey { label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; }
             BackspaceKey { }
         }
 

=== modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml'
--- plugins/sr/qml/Keyboard_sr_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/sr/qml/Keyboard_sr_url_search.qml	2015-03-11 23:05:35 +0000
@@ -77,7 +77,7 @@
             CharKey { label: "н"; shifted: "Н"; }
             CharKey { label: "м"; shifted: "М"; }
             CharKey { label: "ж"; shifted: "Ж"; }
-            CharKey { label: "."; shifted: "."; }
+            CharKey { label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"];  extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; }
             BackspaceKey { }
         }
 

=== modified file 'plugins/sv/qml/Keyboard_sv.qml'
--- plugins/sv/qml/Keyboard_sv.qml	2014-09-26 13:22:23 +0000
+++ plugins/sv/qml/Keyboard_sv.qml	2015-03-11 23:05:35 +0000
@@ -86,9 +86,9 @@
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
-            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/sv/qml/Keyboard_sv_email.qml'
--- plugins/sv/qml/Keyboard_sv_email.qml	2014-11-27 16:57:43 +0000
+++ plugins/sv/qml/Keyboard_sv_email.qml	2015-03-11 23:05:35 +0000
@@ -89,7 +89,7 @@
             CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
 
 

=== modified file 'plugins/sv/qml/Keyboard_sv_url.qml'
--- plugins/sv/qml/Keyboard_sv_url.qml	2014-11-27 16:57:43 +0000
+++ plugins/sv/qml/Keyboard_sv_url.qml	2015-03-11 23:05:35 +0000
@@ -88,7 +88,7 @@
             LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             UrlKey         { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'plugins/sv/qml/Keyboard_sv_url_search.qml'
--- plugins/sv/qml/Keyboard_sv_url_search.qml	2014-11-27 16:57:43 +0000
+++ plugins/sv/qml/Keyboard_sv_url_search.qml	2015-03-11 23:05:35 +0000
@@ -90,7 +90,7 @@
             CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
             SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
             UrlKey         { id: urlKey; label: ".se"; extended: [".com", ".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; }
-            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!", "-", "_", "+", "%","#","/"]; extendedShifted: ["?", "!", "-", "_", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-02-13 16:12:59 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-03-11 23:05:35 +0000
@@ -24,6 +24,7 @@
 
 from time import sleep
 import logging
+import os
 
 from autopilot.input import Pointer, Touch
 from autopilot.introspection import (
@@ -160,7 +161,7 @@
         except AssertionError:
             return False
 
-    def press_key(self, key, capslock_switch=False, long_press=False):
+    def press_key(self, key, capslock_switch=False, long_press=False, slide_offset=None):
         """Tap on the key with the internal pointer
 
         :params key: String containing the text of the key to tap.
@@ -191,7 +192,9 @@
         self._show_keypad(req_keypad)
         self._change_keypad_to_state(req_key_state)
 
-        if long_press:
+        if slide_offset != None:
+            self._select_extended_key(key_pos, slide_offset)
+        elif long_press:
             self._long_press_key(key_pos)
         else:
             self._tap_key(key_pos)
@@ -322,6 +325,16 @@
         sleep(0.5)
         pointer.release()
 
+    def _select_extended_key(self, key_rect, offset, pointer=None):
+        if pointer is None:
+            pointer = Pointer(Touch.create())
+
+        gu = float(os.environ.get('GRID_UNIT_PX', 8))        
+
+        pointer.drag(key_rect.x + key_rect.w / 2.0, key_rect.y + key_rect.h / 2.0,
+                     key_rect.x + key_rect.w / 2.0 + offset, key_rect.y + key_rect.h / 2.0, 
+                     rate=2.77 * gu, time_between_events=2)
+
     def _keyboard_details_changed(self):
         return self._orientation_changed()
 

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-03-11 23:05:35 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-03-11 23:05:35 +0000
@@ -61,7 +61,7 @@
             self.skipTest("Ubuntu Keyboard tests only run on device.")
         super(UbuntuKeyboardTests, self).setUp()
         self.set_test_settings()
-        sleep(1) # Have to give time for gsettings change to propogate
+        sleep(5) # Have to give time for gsettings change to propogate
         self.pointer = Pointer(Touch.create())
 
     def set_test_settings(self):
@@ -606,6 +606,47 @@
             Eventually(Equals(expected))
         )
 
+    def test_extended_punctuation(self):
+        """The characters ?!-_+%#/ and '";:@&() should be available as
+        extended keys from the . and , keys.
+
+        """
+
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        gu = float(os.environ.get('GRID_UNIT_PX', 8))
+
+        # The extended key positions aren't accessible until the
+        # drag has already started, so we need to provide their
+        # offsets manually based on the known extended key cell
+        # width
+        keyboard.press_key('.', slide_offset=-17.5 * gu)
+        keyboard.press_key('.', slide_offset=-14 * gu)
+        keyboard.press_key('.', slide_offset=-10.5 * gu)
+        keyboard.press_key('.', slide_offset=-7.5 * gu)
+        keyboard.press_key('.', slide_offset=-3.5 * gu)
+        keyboard.press_key('.', slide_offset=1)
+        keyboard.press_key('.', slide_offset=3.5 * gu)
+        keyboard.press_key('.', slide_offset=7 * gu)
+        
+        keyboard.press_key(',', slide_offset=-10.5 * gu)
+        keyboard.press_key(',', slide_offset=-7 * gu)
+        keyboard.press_key(',', slide_offset=-3.5 * gu)
+        keyboard.press_key(',', slide_offset=-1 * gu)
+        keyboard.press_key(',', slide_offset=3.5 * gu)
+        keyboard.press_key(',', slide_offset=7 * gu)
+        keyboard.press_key(',', slide_offset=10.5 * gu)
+        keyboard.press_key(',', slide_offset=14 * gu)
+
+        expected = "!-_?+%#/\";:'@&()"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
 
 class UbuntuKeyboardPinyin(UbuntuKeyboardTests):
 
@@ -781,7 +822,7 @@
 
         keyboard.press_key("language")
 
-        sleep(1)
+        sleep(5)
 
         keyboard = Keyboard()
 
@@ -805,7 +846,7 @@
 
         keyboard.press_key("language")
 
-        sleep(1)
+        sleep(5)
 
         keyboard = Keyboard()