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
=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml 2013-12-05 19:26:19 +0000
+++ plugins/about/Storage.qml 2014-01-23 14:25:25 +0000
@@ -86,7 +86,7 @@
86 UbuntuColors.lightAubergine]86 UbuntuColors.lightAubergine]
87 property variant spaceLabels: [87 property variant spaceLabels: [
88 i18n.tr("Used by Ubuntu"),88 i18n.tr("Used by Ubuntu"),
89 i18n.tr("Movies"),89 i18n.tr("Videos"),
90 i18n.tr("Audio"),90 i18n.tr("Audio"),
91 i18n.tr("Pictures"),91 i18n.tr("Pictures"),
92 i18n.tr("Other files"),92 i18n.tr("Other files"),
9393
=== modified file 'plugins/flight-mode/flight-mode.settings'
--- plugins/flight-mode/flight-mode.settings 2013-09-17 13:41:10 +0000
+++ plugins/flight-mode/flight-mode.settings 2014-01-23 14:25:25 +0000
@@ -1,5 +1,5 @@
1{1{
2 "name": "Flight mode",2 "name": "Flight Mode",
3 "icon": "/usr/share/ubuntu/settings/system/icons/settings-flight-mode.svg",3 "icon": "/usr/share/ubuntu/settings/system/icons/settings-flight-mode.svg",
4 "translations": "ubuntu-system-settings",4 "translations": "ubuntu-system-settings",
5 "category": "uncategorized-top",5 "category": "uncategorized-top",
66
=== modified file 'plugins/orientation-lock/orientation-lock.settings'
--- plugins/orientation-lock/orientation-lock.settings 2013-09-12 11:18:44 +0000
+++ plugins/orientation-lock/orientation-lock.settings 2014-01-23 14:25:25 +0000
@@ -1,6 +1,6 @@
1{1{
2 "icon": "/usr/share/ubuntu/settings/system/icons/settings-orientation-lock.svg",2 "icon": "/usr/share/ubuntu/settings/system/icons/settings-orientation-lock.svg",
3 "name": "Orientation lock",3 "name": "Orientation Lock",
4 "translations": "ubuntu-system-settings",4 "translations": "ubuntu-system-settings",
5 "category": "uncategorized-top",5 "category": "uncategorized-top",
6 "priority": 0,6 "priority": 0,
77
=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml 2013-10-14 16:10:56 +0000
+++ plugins/sound/PageComponent.qml 2014-01-23 14:25:25 +0000
@@ -81,7 +81,7 @@
81 control: CheckBox {81 control: CheckBox {
82 checked: false82 checked: false
83 }83 }
84 text: i18n.tr("Vibrate in silent mode")84 text: i18n.tr("Vibrate in Silent Mode")
85 visible: showAllUI85 visible: showAllUI
86 }86 }
8787
@@ -106,7 +106,7 @@
106 control: CheckBox {106 control: CheckBox {
107 checked: false107 checked: false
108 }108 }
109 text: i18n.tr("Keyboard sounds")109 text: i18n.tr("Keyboard sound")
110 visible: showAllUI110 visible: showAllUI
111 }111 }
112112
113113
=== modified file 'po/ubuntu-system-settings.pot'
--- po/ubuntu-system-settings.pot 2014-01-09 13:06:58 +0000
+++ po/ubuntu-system-settings.pot 2014-01-23 14:25:25 +0000
@@ -42,7 +42,7 @@
42msgstr ""42msgstr ""
4343
44#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:8444#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:84
45msgid "Vibrate in silent mode"45msgid "Vibrate in Silent Mode"
46msgstr ""46msgstr ""
4747
48#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:8948#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:89
@@ -54,10 +54,6 @@
54msgid "Message received"54msgid "Message received"
55msgstr ""55msgstr ""
5656
57#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:109
58msgid "Keyboard sounds"
59msgstr ""
60
61#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:11757#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:117
62msgid "Lock sound"58msgid "Lock sound"
63msgstr ""59msgstr ""
@@ -477,6 +473,7 @@
477msgstr ""473msgstr ""
478474
479#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/language//PageComponent.qml:154475#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/language//PageComponent.qml:154
476#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/sound//PageComponent.qml:109
480msgid "Keyboard sound"477msgid "Keyboard sound"
481msgstr ""478msgstr ""
482479
@@ -1152,7 +1149,7 @@
1152msgstr ""1149msgstr ""
11531150
1154#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:891151#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:89
1155msgid "Movies"1152msgid "Videos"
1156msgstr ""1153msgstr ""
11571154
1158#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:901155#: /tmp/build/ubuntu-system-settings-0.1+14.04.20140108.1/plugins/about//Storage.qml:90
@@ -1247,7 +1244,7 @@
12471244
1248#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching1245#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
1249#: settings.js:181246#: settings.js:18
1250msgid "Orientation lock"1247msgid "Orientation Lock"
1251msgstr ""1248msgstr ""
12521249
1253#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching1250#. TRANSLATORS: This is a keyword or name for the orientation-lock plugin which is used while searching
@@ -1398,7 +1395,7 @@
13981395
1399#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching1396#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
1400#: settings.js:1081397#: settings.js:108
1401msgid "Flight mode"1398msgid "Flight Mode"
1402msgstr ""1399msgstr ""
14031400
1404#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching1401#. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
14051402
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py 2013-12-02 19:31:59 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py 2014-01-23 14:25:25 +0000
@@ -115,7 +115,7 @@
115115
116 def test_space_movies(self):116 def test_space_movies(self):
117 """ Checks whether space item is available """117 """ Checks whether space item is available """
118 self.assert_space_item('moviesItem', _('Movies'))118 self.assert_space_item('moviesItem', _('Videos'))
119119
120 def test_space_audio(self):120 def test_space_audio(self):
121 """ Checks whether space item is available """121 """ Checks whether space item is available """

Subscribers

People subscribed via source and target branches