ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/serbian-update into lp:ubuntu-keyboard

  1. serbian-update
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 218
Merged at revision: 220
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/serbian-update
Merge into: lp:ubuntu-keyboard
Diff against target: 160 lines (+37/-26)
5 files modified
plugins/sr/qml/Keyboard_sr.qml (+6/-5)
plugins/sr/qml/Keyboard_sr_email.qml (+8/-6)
plugins/sr/qml/Keyboard_sr_url.qml (+8/-6)
plugins/sr/qml/Keyboard_sr_url_search.qml (+8/-6)
po/ubuntu-keyboard.pot (+7/-3)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/serbian-update
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+232604@code.launchpad.net

Commit message

Update Serbian layout to account for changes in POT generation and extended bottom row layout.

Description of the change

Updates Serbian layout to account for changes in POT generation and extended bottom row layout.

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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?

 * Yes

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

 * No change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/460/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/85

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

Did you perform an exploratory manual test run of the 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/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/sr/qml/Keyboard_sr.qml'
2--- plugins/sr/qml/Keyboard_sr.qml 2014-08-21 16:48:34 +0000
3+++ plugins/sr/qml/Keyboard_sr.qml 2014-08-28 17:21:01 +0000
4@@ -16,6 +16,7 @@
5
6 import QtQuick 2.0
7 import "../../keys"
8+import "../../keys/key_constants.js" as UI
9
10 KeyPad {
11 anchors.fill: parent
12@@ -83,12 +84,12 @@
13 anchors.left: parent.left
14 anchors.right: parent.right
15
16- height: panel.keyHeight;
17+ height: panel.keyHeight + units.gu(UI.bottom_margin*2);
18
19- SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
20- LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
21- SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: enterKey.left; noMagnifier: true }
22- ReturnKey { id: enterKey; anchors.right: parent.right }
23+ SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
24+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
25+ SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: enterKey.left; noMagnifier: true; height: parent.height; }
26+ ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
27 }
28 } // column
29 }
30
31=== modified file 'plugins/sr/qml/Keyboard_sr_email.qml'
32--- plugins/sr/qml/Keyboard_sr_email.qml 2014-08-21 17:09:37 +0000
33+++ plugins/sr/qml/Keyboard_sr_email.qml 2014-08-28 17:21:01 +0000
34@@ -16,6 +16,7 @@
35
36 import QtQuick 2.0
37 import "../../keys"
38+import "../../keys/key_constants.js" as UI
39
40 KeyPad {
41 anchors.fill: parent
42@@ -84,12 +85,13 @@
43 anchors.left: parent.left
44 anchors.right: parent.right
45
46- height: panel.keyHeight;
47- SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
48- LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
49- SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true }
50- UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; }
51- ReturnKey { id: enterKey; anchors.right: parent.right }
52+ height: panel.keyHeight + units.gu(UI.bottom_margin*2);
53+
54+ SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
55+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
56+ SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
57+ UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; height: parent.height; }
58+ ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
59 }
60 } // column
61 }
62
63=== modified file 'plugins/sr/qml/Keyboard_sr_url.qml'
64--- plugins/sr/qml/Keyboard_sr_url.qml 2014-08-21 17:04:43 +0000
65+++ plugins/sr/qml/Keyboard_sr_url.qml 2014-08-28 17:21:01 +0000
66@@ -16,6 +16,7 @@
67
68 import QtQuick 2.0
69 import "../../keys"
70+import "../../keys/key_constants.js" as UI
71
72 KeyPad {
73 anchors.fill: parent
74@@ -84,12 +85,13 @@
75 anchors.left: parent.left
76 anchors.right: parent.right
77
78- height: panel.keyHeight;
79- SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
80- LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
81- SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true }
82- UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; }
83- ReturnKey { id: enterKey; anchors.right: parent.right }
84+ height: panel.keyHeight + units.gu(UI.bottom_margin*2);
85+
86+ SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
87+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
88+ SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
89+ UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; height: parent.height; }
90+ ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
91 }
92 } // column
93 }
94
95=== modified file 'plugins/sr/qml/Keyboard_sr_url_search.qml'
96--- plugins/sr/qml/Keyboard_sr_url_search.qml 2014-08-21 17:04:43 +0000
97+++ plugins/sr/qml/Keyboard_sr_url_search.qml 2014-08-28 17:21:01 +0000
98@@ -16,6 +16,7 @@
99
100 import QtQuick 2.0
101 import "../../keys"
102+import "../../keys/key_constants.js" as UI
103
104 KeyPad {
105 anchors.fill: parent
106@@ -84,12 +85,13 @@
107 anchors.left: parent.left
108 anchors.right: parent.right
109
110- height: panel.keyHeight;
111- SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
112- LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; }
113- SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true }
114- UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; }
115- ReturnKey { id: enterKey; anchors.right: parent.right }
116+ height: panel.keyHeight + units.gu(UI.bottom_margin*2);
117+
118+ SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
119+ LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
120+ SpaceKey { id: spaceKey; anchors.left: languageMenuButton.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
121+ UrlKey { id: urlKey; label: ".срб"; extended: [".пр.срб", ".орг.срб", ".од.срб" ]; extendedShifted: [".ак.срб", ".упр.срб", ".обр.срб" ]; anchors.right: enterKey.left; height: parent.height; }
122+ ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
123 }
124 } // column
125 }
126
127=== modified file 'plugins/sr/src/database_sr.db'
128Binary files plugins/sr/src/database_sr.db 2014-07-28 18:19:04 +0000 and plugins/sr/src/database_sr.db 2014-08-28 17:21:01 +0000 differ
129=== modified file 'po/ubuntu-keyboard.pot'
130--- po/ubuntu-keyboard.pot 2014-08-21 11:50:28 +0000
131+++ po/ubuntu-keyboard.pot 2014-08-28 17:21:01 +0000
132@@ -8,7 +8,7 @@
133 msgstr ""
134 "Project-Id-Version: ubuntu-keyboard\n"
135 "Report-Msgid-Bugs-To: \n"
136-"POT-Creation-Date: 2014-08-21 12:49+0100\n"
137+"POT-Creation-Date: 2014-08-28 17:26+0100\n"
138 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
139 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
140 "Language-Team: LANGUAGE <LL@li.org>\n"
141@@ -82,13 +82,17 @@
142 msgstr ""
143
144 #: ../qml/keys/LanguageMenu.qml:85
145+msgid "Serbian"
146+msgstr ""
147+
148+#: ../qml/keys/LanguageMenu.qml:86
149 msgid "Swedish"
150 msgstr ""
151
152-#: ../qml/keys/LanguageMenu.qml:86
153+#: ../qml/keys/LanguageMenu.qml:87
154 msgid "Chinese - Pinyin"
155 msgstr ""
156
157-#: ../qml/keys/LanguageMenu.qml:89
158+#: ../qml/keys/LanguageMenu.qml:90
159 msgid "Language: "
160 msgstr ""

Subscribers

People subscribed via source and target branches