Merge lp:~mterry/ubuntu-filemanager-app/ok into lp:ubuntu-filemanager-app

Proposed by Michael Terry on 2015-08-30
Status: Merged
Approved by: Carlos Jose Mazieri on 2015-09-06
Approved revision: 460
Merged at revision: 461
Proposed branch: lp:~mterry/ubuntu-filemanager-app/ok
Merge into: lp:ubuntu-filemanager-app
Diff against target: 51 lines (+4/-4)
4 files modified
src/app/qml/ui/AuthenticationDialog.qml (+1/-1)
src/app/qml/ui/ConfirmDialog.qml (+1/-1)
src/app/qml/ui/ConfirmDialogWithInput.qml (+1/-1)
src/app/qml/ui/NotifyDialog.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/ubuntu-filemanager-app/ok
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-09-06
Carlos Jose Mazieri 2015-08-30 Approve on 2015-09-06
Review via email: mp+269578@code.launchpad.net

Commit message

Update spelling of Ok to OK.

Ok isn't really a word. It's either OK or Okay. Ok looks like it should be pronounced "ock".

http://www.merriam-webster.com/dictionary/ok

Description of the change

Update spelling of Ok to OK.

Ok isn't really a word. It's either OK or Okay. Ok looks like it should be pronounced "ock".

http://www.merriam-webster.com/dictionary/ok

To post a comment you must log in.

Have you looked at the entire repository code?

It may have any .cpp or .h code using the same, some messages come from c++ code.

review: Needs Information
Michael Terry (mterry) wrote :

Yup, the rest of the code looks fine.

OK, thanks.

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
2--- src/app/qml/ui/AuthenticationDialog.qml 2014-10-28 22:21:55 +0000
3+++ src/app/qml/ui/AuthenticationDialog.qml 2015-08-30 14:17:55 +0000
4@@ -46,7 +46,7 @@
5 id: okButton
6 objectName: "okButton"
7
8- text: i18n.tr("Ok")
9+ text: i18n.tr("OK")
10
11 onClicked: {
12 passwordEntered(passwordField.text)
13
14=== modified file 'src/app/qml/ui/ConfirmDialog.qml'
15--- src/app/qml/ui/ConfirmDialog.qml 2014-09-20 10:49:51 +0000
16+++ src/app/qml/ui/ConfirmDialog.qml 2015-08-30 14:17:55 +0000
17@@ -28,7 +28,7 @@
18 Button {
19 id: okButton
20 objectName: "okButton"
21- text: i18n.tr("Ok")
22+ text: i18n.tr("OK")
23 onClicked: {
24 accepted()
25 PopupUtils.close(root)
26
27=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
28--- src/app/qml/ui/ConfirmDialogWithInput.qml 2014-09-20 10:49:51 +0000
29+++ src/app/qml/ui/ConfirmDialogWithInput.qml 2015-08-30 14:17:55 +0000
30@@ -44,7 +44,7 @@
31
32 Button {
33 objectName: "okButton"
34- text: i18n.tr("Ok")
35+ text: i18n.tr("OK")
36 enabled: input.acceptableInput
37 onClicked: {
38 accepted()
39
40=== modified file 'src/app/qml/ui/NotifyDialog.qml'
41--- src/app/qml/ui/NotifyDialog.qml 2014-09-20 10:49:51 +0000
42+++ src/app/qml/ui/NotifyDialog.qml 2015-08-30 14:17:55 +0000
43@@ -22,7 +22,7 @@
44 Dialog {
45 id: root
46 Button {
47- text: i18n.tr("Ok")
48+ text: i18n.tr("OK")
49 onClicked: {
50 PopupUtils.close(root)
51 }

Subscribers

People subscribed via source and target branches