ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/small-strings-tweaks into lp:ubuntu-system-settings

  1. small-strings-tweaks
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Iain Lane
Approved revision: 574
Merged at revision: 580
Proposed branch: lp:~seb128/ubuntu-system-settings/small-strings-tweaks
Merge into: lp:ubuntu-system-settings
Diff against target: 129 lines (+11/-14)
6 files modified
plugins/about/Storage.qml (+1/-1)
plugins/flight-mode/flight-mode.settings (+1/-1)
plugins/orientation-lock/orientation-lock.settings (+1/-1)
plugins/sound/PageComponent.qml (+2/-2)
po/ubuntu-system-settings.pot (+5/-8)
tests/autopilot/ubuntu_system_settings/tests/test_about.py (+1/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/small-strings-tweaks
Reviewer Review Type Date Requested Status
Iain Lane Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+202822@code.launchpad.net

Commit message

Small strings tweaks:
- Update Flight Mode and Orientation Lock casing, they are proper nouns
- storage: rename "Movies" to "Videos"
- update the translations template

Description of the change

Small strings tweaks:
- Update Flight Mode and Orientation Lock casing, they are proper nouns
- storage: rename "Movies" to "Videos"
- update the translations template

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

The corresponding spec changes

- https://wiki.ubuntu.com/AboutThisDevice?action=diff&rev2=18&rev1=17

- https://wiki.ubuntu.com/SystemSettings erratas list

"“Flight mode” should be “Flight Mode”, and “Orientation lock” should be “Orientation Lock”, because they are proper nouns. "

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

PASSED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/591/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/94

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

review: Approve (continuous-integration)
lp:~seb128/ubuntu-system-settings/small-strings-tweaks updated
572. By Sebastien Bacher

update the label in the tests as well

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

PASSED: Continuous integration, rev:572
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/592/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/95

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

review: Approve (continuous-integration)
lp:~seb128/ubuntu-system-settings/small-strings-tweaks updated
573. By Sebastien Bacher

Use same wording for "Keyboard sound" in sounds and languages

574. By Sebastien Bacher

sound: correctly case Silent Mode there as well

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

FAILED: Continuous integration, rev:573
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/593/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/97/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/96/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:574
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/594/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/98/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/97/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The x86 build node crashed during the last CI run. It has been restarted.

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

PASSED: Continuous integration, rev:574
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/98

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

review: Approve (continuous-integration)
Revision history for this message
Iain Lane (laney) wrote :

breaking translations is a shame, but okay

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/Storage.qml'
2--- plugins/about/Storage.qml 2013-12-05 19:26:19 +0000
3+++ plugins/about/Storage.qml 2014-01-23 14:25:25 +0000
4@@ -86,7 +86,7 @@
5 UbuntuColors.lightAubergine]
6 property variant spaceLabels: [
7 i18n.tr("Used by Ubuntu"),
8- i18n.tr("Movies"),
9+ i18n.tr("Videos"),
10 i18n.tr("Audio"),
11 i18n.tr("Pictures"),
12 i18n.tr("Other files"),
13
14=== modified file 'plugins/flight-mode/flight-mode.settings'
15--- plugins/flight-mode/flight-mode.settings 2013-09-17 13:41:10 +0000
16+++ plugins/flight-mode/flight-mode.settings 2014-01-23 14:25:25 +0000
17@@ -1,5 +1,5 @@
18 {
19- "name": "Flight mode",
20+ "name": "Flight Mode",
21 "icon": "/usr/share/ubuntu/settings/system/icons/settings-flight-mode.svg",
22 "translations": "ubuntu-system-settings",
23 "category": "uncategorized-top",
24
25=== modified file 'plugins/orientation-lock/orientation-lock.settings'
26--- plugins/orientation-lock/orientation-lock.settings 2013-09-12 11:18:44 +0000
27+++ plugins/orientation-lock/orientation-lock.settings 2014-01-23 14:25:25 +0000
28@@ -1,6 +1,6 @@
29 {
30 "icon": "/usr/share/ubuntu/settings/system/icons/settings-orientation-lock.svg",
31- "name": "Orientation lock",
32+ "name": "Orientation Lock",
33 "translations": "ubuntu-system-settings",
34 "category": "uncategorized-top",
35 "priority": 0,
36
37=== modified file 'plugins/sound/PageComponent.qml'
38--- plugins/sound/PageComponent.qml 2013-10-14 16:10:56 +0000
39+++ plugins/sound/PageComponent.qml 2014-01-23 14:25:25 +0000
40@@ -81,7 +81,7 @@
41 control: CheckBox {
42 checked: false
43 }
44- text: i18n.tr("Vibrate in silent mode")
45+ text: i18n.tr("Vibrate in Silent Mode")
46 visible: showAllUI
47 }
48
49@@ -106,7 +106,7 @@
50 control: CheckBox {
51 checked: false
52 }
53- text: i18n.tr("Keyboard sounds")
54+ text: i18n.tr("Keyboard sound")
55 visible: showAllUI
56 }
57
58
59=== modified file 'po/ubuntu-system-settings.pot'
60--- po/ubuntu-system-settings.pot 2014-01-09 13:06:58 +0000
61+++ po/ubuntu-system-settings.pot 2014-01-23 14:25:25 +0000
62@@ -42,7 +42,7 @@
63 msgstr ""
64
65 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:84
66-msgid "Vibrate in silent mode"
67+msgid "Vibrate in Silent Mode"
68 msgstr ""
69
70 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:89
71@@ -54,10 +54,6 @@
72 msgid "Message received"
73 msgstr ""
74
75-#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:109
76-msgid "Keyboard sounds"
77-msgstr ""
78-
79 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:117
80 msgid "Lock sound"
81 msgstr ""
82@@ -477,6 +473,7 @@
83 msgstr ""
84
85 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/language//PageComponent.qml:154
86+#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:109
87 msgid "Keyboard sound"
88 msgstr ""
89
90@@ -1152,7 +1149,7 @@
91 msgstr ""
92
93 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:89
94-msgid "Movies"
95+msgid "Videos"
96 msgstr ""
97
98 #: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:90
99@@ -1247,7 +1244,7 @@
100
101 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
102 #: settings.js:18
103-msgid "Orientation lock"
104+msgid "Orientation Lock"
105 msgstr ""
106
107 #. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
108@@ -1398,7 +1395,7 @@
109
110 #. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
111 #: settings.js:108
112-msgid "Flight mode"
113+msgid "Flight Mode"
114 msgstr ""
115
116 #. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
117
118=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
119--- tests/autopilot/ubuntu_system_settings/tests/test_about.py 2013-12-02 19:31:59 +0000
120+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py 2014-01-23 14:25:25 +0000
121@@ -115,7 +115,7 @@
122
123 def test_space_movies(self):
124 """ Checks whether space item is available """
125- self.assert_space_item('moviesItem', _('Movies'))
126+ self.assert_space_item('moviesItem', _('Videos'))
127
128 def test_space_audio(self):
129 """ Checks whether space item is available """

Subscribers

People subscribed via source and target branches