Skip to content
GitLab
Commit 5c7ce8ff authored by Jaeic Lee's avatar Jaeic Lee
Browse files

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

parents 31ad9b77 0daa7a88
Hide whitespace changes
Inline Side-by-side
cockatrice/src/dlg_settings.cpp
View file @ 5c7ce8ff
...@@ -652,7 +652,7 @@ void MessagesSettingsPage::retranslateUi() ...@@ -652,7 +652,7 @@ void MessagesSettingsPage::retranslateUi()
chatGroupBox->setTitle(tr("Chat settings")); chatGroupBox->setTitle(tr("Chat settings"));
chatMentionCheckBox.setText(tr("Enable chat mentions ('@yourusername' in chat log will be highlighted)")); chatMentionCheckBox.setText(tr("Enable chat mentions ('@yourusername' in chat log will be highlighted)"));
messageShortcuts->setTitle(tr("In-game message macros")); 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) DlgSettings::DlgSettings(QWidget *parent)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment