Ubuntu Clock App

Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-alarm-stops-after into lp:ubuntu-clock-app

  1. ubuntu-clock-alarm-stops-after
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 326
Merged at revision: 325
Proposed branch: lp:~gang65/ubuntu-clock-app/ubuntu-clock-alarm-stops-after
Merge into: lp:ubuntu-clock-app
Diff against target: 64 lines (+6/-5)
3 files modified
app/alarm/AlarmSettingsPage.qml (+2/-2)
debian/changelog (+1/-0)
po/com.ubuntu.clock.pot (+3/-3)
To merge this branch: bzr merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-alarm-stops-after
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+267715@code.launchpad.net

Commit message

Change "Silence after" to "Alarm stops afer" according to UX design

Description of the change

Change "Silence after" to "Alarm stops afer" according to UX design

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM! Thnx for the MP.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmSettingsPage.qml'
2--- app/alarm/AlarmSettingsPage.qml 2015-07-24 13:27:30 +0000
3+++ app/alarm/AlarmSettingsPage.qml 2015-08-11 20:42:20 +0000
4@@ -50,7 +50,7 @@
5 Component.onCompleted: initialise()
6
7 function initialise() {
8- // TRANSLATORS: Silence after
9+ // TRANSLATORS: Alarm stops after
10 durationModel.append({ "duration": 10, "text": i18n.tr("%1 minute", "%1 minutes", 10).arg(10) })
11 durationModel.append({ "duration": 20, "text": i18n.tr("%1 minute", "%1 minutes", 20).arg(20) })
12 durationModel.append({ "duration": 30, "text": i18n.tr("%1 minute", "%1 minutes", 30).arg(30) })
13@@ -122,7 +122,7 @@
14 id: _alarmDuration
15
16 listViewHeight: units.gu(28)
17- text: i18n.tr("Silence after")
18+ text: i18n.tr("Alarm stops after")
19 subText: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
20
21 model: durationModel
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2015-08-08 18:45:05 +0000
25+++ debian/changelog 2015-08-11 20:42:20 +0000
26@@ -2,6 +2,7 @@
27
28 [Bartosz Kosiorek]
29 * Disable automatic translation and update README.translations
30+ * Change "Silence after" to "Alarm stops afer" according to UX design
31
32 [Nekhelesh Ramananthan]
33 * Increase the height of times in the alarm screen (LP: #1365428)
34
35=== modified file 'po/com.ubuntu.clock.pot'
36--- po/com.ubuntu.clock.pot 2015-08-07 11:27:59 +0000
37+++ po/com.ubuntu.clock.pot 2015-08-11 20:42:20 +0000
38@@ -8,7 +8,7 @@
39 msgstr ""
40 "Project-Id-Version: \n"
41 "Report-Msgid-Bugs-To: \n"
42-"POT-Creation-Date: 2015-08-07 13:27+0200\n"
43+"POT-Creation-Date: 2015-08-11 22:38+0200\n"
44 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
45 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
46 "Language-Team: LANGUAGE <LL@li.org>\n"
47@@ -66,7 +66,7 @@
48 msgid "Settings"
49 msgstr ""
50
51-#. TRANSLATORS: Silence after
52+#. TRANSLATORS: Alarm stops after
53 #. TRANSLATORS: Snooze for
54 #: ../app/alarm/AlarmSettingsPage.qml:54 ../app/alarm/AlarmSettingsPage.qml:55
55 #: ../app/alarm/AlarmSettingsPage.qml:56 ../app/alarm/AlarmSettingsPage.qml:57
56@@ -85,7 +85,7 @@
57 msgstr ""
58
59 #: ../app/alarm/AlarmSettingsPage.qml:125
60-msgid "Silence after"
61+msgid "Alarm stops after"
62 msgstr ""
63
64 #: ../app/alarm/AlarmSettingsPage.qml:163

Subscribers

People subscribed via source and target branches