Merge remote-tracking branch 'upstream/master' into korean-translation

This commit is contained in:
Jaeic Lee 2015-01-21 16:46:32 +09:00
commit 5c7ce8ffb7

View file

@ -652,7 +652,7 @@ void MessagesSettingsPage::retranslateUi()
chatGroupBox->setTitle(tr("Chat settings"));
chatMentionCheckBox.setText(tr("Enable chat mentions ('@yourusername' in chat log will be highlighted)"));
messageShortcuts->setTitle(tr("In-game message macros"));
ignoreUnregUsersMainChat.setText(tr("Ignore unregisterd users in main chat"));
ignoreUnregUsersMainChat.setText(tr("Ignore unregistered users in main chat"));
}
DlgSettings::DlgSettings(QWidget *parent)