telephony-service

Merge lp:~mterry/telephony-service/ok into lp:telephony-service

  1. ok
  2. Merge into trunk
Proposed by Michael Terry
Status: Needs review
Proposed branch: lp:~mterry/telephony-service/ok
Merge into: lp:telephony-service
Diff against target: 25 lines (+2/-2)
2 files modified
indicator/textchannelobserver.cpp (+1/-1)
indicator/ussdindicator.cpp (+1/-1)
To merge this branch: bzr merge lp:~mterry/telephony-service/ok
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+297408@code.launchpad.net

Commit message

Change spelling of Ok to OK.

Description of the change

It's either OK or Okay. Ok sounds like a sound a chicken would make.

To post a comment you must log in.

Unmerged revisions

1200. By Michael Terry

Use OK instead of Ok

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'indicator/textchannelobserver.cpp'
2--- indicator/textchannelobserver.cpp 2016-03-30 13:34:38 +0000
3+++ indicator/textchannelobserver.cpp 2016-06-14 21:56:01 +0000
4@@ -309,7 +309,7 @@
5
6 notify_notification_add_action (notification,
7 "notification_ok_action",
8- C::gettext("Ok"),
9+ C::gettext("OK"),
10 flash_notification_action,
11 NULL,
12 NULL);
13
14=== modified file 'indicator/ussdindicator.cpp'
15--- indicator/ussdindicator.cpp 2015-07-10 13:30:03 +0000
16+++ indicator/ussdindicator.cpp 2016-06-14 21:56:01 +0000
17@@ -113,7 +113,7 @@
18 {
19 NotificationMenu *menu = replyRequired ? &m_menuRequest : &m_menuNotification;
20 QString actionId = "ok_id";
21- QString actionLabel = C::gettext("Ok");
22+ QString actionLabel = C::gettext("OK");
23 if (replyRequired) {
24 actionId = "reply_id";
25 actionLabel = C::gettext("Reply");

Subscribers

People subscribed via source and target branches