summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-14 19:19:24 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-14 19:19:24 (GMT)
commit3b3eb0ff07877c8cc9bb8a56f9be8c17ca60ec01 (patch)
treeb88f033b203c10556595399fb1b56f8b480c00a9
parentaebf16650e33f442d3cc3bbc87f034c3c146e596 (diff)
downloadswift-3b3eb0ff07877c8cc9bb8a56f9be8c17ca60ec01.zip
swift-3b3eb0ff07877c8cc9bb8a56f9be8c17ca60ec01.tar.bz2
Use "OK" instead of "Ok" for consistency.
Resolves: #791
-rw-r--r--Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui2
-rw-r--r--Swift/QtUI/QtContactEditWindow.cpp2
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui
index 6416042..49460ab 100644
--- a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui
+++ b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui
@@ -81,7 +81,7 @@
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
- <string>Ok</string>
+ <string>OK</string>
</property>
<property name="autoDefault">
<bool>false</bool>
diff --git a/Swift/QtUI/QtContactEditWindow.cpp b/Swift/QtUI/QtContactEditWindow.cpp
index 5affaef..4be2939 100644
--- a/Swift/QtUI/QtContactEditWindow.cpp
+++ b/Swift/QtUI/QtContactEditWindow.cpp
@@ -41,7 +41,7 @@ QtContactEditWindow::QtContactEditWindow() : contactEditWidget_(NULL) {
QPushButton* removeButton = new QPushButton(tr("Remove contact"), this);
connect(removeButton, SIGNAL(clicked()), this, SLOT(handleRemoveContact()));
buttonLayout->addWidget(removeButton);
- QPushButton* okButton = new QPushButton(tr("Ok"), this);
+ QPushButton* okButton = new QPushButton(tr("OK"), this);
connect(okButton, SIGNAL(clicked()), this, SLOT(handleUpdateContact()));
buttonLayout->addStretch();
buttonLayout->addWidget(okButton);
diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
index c38f421..83b8b31 100644
--- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp
+++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
@@ -22,7 +22,7 @@ QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<Subsc
if (event_->getConcluded()) {
QLabel* doneLabel = new QLabel(tr("You have already replied to this request"));
- QPushButton* okButton = new QPushButton(tr("Ok"), this);
+ QPushButton* okButton = new QPushButton(tr("OK"), this);
connect(okButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
layout->addWidget(doneLabel);
layout->addWidget(okButton);