From 7eb27a2228fdb34d6c629ddc5fcce82583db3a85 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Fri, 7 May 2010 14:18:16 +0000
Subject: Use 'room' to refer to MUCs.

Resolves: #338

diff --git a/Swift/QtUI/ChatList/ChatListModel.cpp b/Swift/QtUI/ChatList/ChatListModel.cpp
index 40ed1b7..0e4af55 100644
--- a/Swift/QtUI/ChatList/ChatListModel.cpp
+++ b/Swift/QtUI/ChatList/ChatListModel.cpp
@@ -12,7 +12,7 @@ namespace Swift {
 
 ChatListModel::ChatListModel() {
 	root_ = new ChatListGroupItem("", NULL);
-	mucBookmarks_ = new ChatListGroupItem("MUC Bookmarks", root_);
+	mucBookmarks_ = new ChatListGroupItem("Bookmarked Rooms", root_);
 	root_->addItem(mucBookmarks_);
 }
 
diff --git a/Swift/QtUI/QtJoinMUCDialog.ui b/Swift/QtUI/QtJoinMUCDialog.ui
index 3b67c68..881d4c5 100644
--- a/Swift/QtUI/QtJoinMUCDialog.ui
+++ b/Swift/QtUI/QtJoinMUCDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Join chatroom</string>
+   <string>Join Room</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -19,7 +19,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Chatroom</string>
+        <string>Room</string>
        </property>
       </widget>
      </item>
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 0381d9e..c5dfd93 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -80,7 +80,7 @@ QtMainWindow::QtMainWindow(UIEventStream* uiEventStream) : QWidget() {
 
 	QMenu* actionsMenu = new QMenu(tr("Actions"), this);
 	menus_.push_back(actionsMenu);
-	QAction* joinMUCAction = new QAction("Join chatroom", this);
+	QAction* joinMUCAction = new QAction("Join Room", this);
 	connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction()));
 	actionsMenu->addAction(joinMUCAction);
 	addAction_ = new QAction("Add Contact", this);
-- 
cgit v0.10.2-6-g49f6