ubuntu-touch-coreapps-reviewers team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/ubuntu-filemanager-app/ok into lp:ubuntu-filemanager-app.

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

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~mterry/ubuntu-filemanager-app/ok/+merge/269578

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
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~mterry/ubuntu-filemanager-app/ok into lp:ubuntu-filemanager-app.

=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml	2014-10-28 22:21:55 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml	2015-08-30 14:17:55 +0000
@@ -46,7 +46,7 @@
         id: okButton
         objectName: "okButton"
 
-        text: i18n.tr("Ok")
+        text: i18n.tr("OK")
 
         onClicked: {
             passwordEntered(passwordField.text)

=== modified file 'src/app/qml/ui/ConfirmDialog.qml'
--- src/app/qml/ui/ConfirmDialog.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/ui/ConfirmDialog.qml	2015-08-30 14:17:55 +0000
@@ -28,7 +28,7 @@
     Button {
         id: okButton
         objectName: "okButton"
-        text: i18n.tr("Ok")
+        text: i18n.tr("OK")
         onClicked: {
             accepted()
             PopupUtils.close(root)

=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
--- src/app/qml/ui/ConfirmDialogWithInput.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/ui/ConfirmDialogWithInput.qml	2015-08-30 14:17:55 +0000
@@ -44,7 +44,7 @@
 
     Button {
         objectName: "okButton"
-        text: i18n.tr("Ok")
+        text: i18n.tr("OK")
         enabled: input.acceptableInput
         onClicked: {
             accepted()

=== modified file 'src/app/qml/ui/NotifyDialog.qml'
--- src/app/qml/ui/NotifyDialog.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/ui/NotifyDialog.qml	2015-08-30 14:17:55 +0000
@@ -22,7 +22,7 @@
 Dialog {
     id: root
     Button {
-        text: i18n.tr("Ok")
+        text: i18n.tr("OK")
         onClicked: {
             PopupUtils.close(root)
         }