diff options
| author | bunnei <bunneidev@gmail.com> | 2022-08-16 11:49:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-16 11:49:33 -0700 |
| commit | 6f931d49c74017fb66bf285dd060bc455ae05c85 (patch) | |
| tree | 8d0d47e28d1f35a2a97664a14dccb94e9a96fbb5 /src/yuzu/multiplayer/message.cpp | |
| parent | 4d72612416d8075ad36fa01cbde02956fc0a11f6 (diff) | |
| parent | 4976d14009aded6edadcb07add398d091997bde0 (diff) | |
Merge pull request #8685 from FearlessTobi/multiplayer-part2
core, network: Add ability to proxy socket packets
Diffstat (limited to 'src/yuzu/multiplayer/message.cpp')
| -rw-r--r-- | src/yuzu/multiplayer/message.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/yuzu/multiplayer/message.cpp b/src/yuzu/multiplayer/message.cpp index 76ec276ad..94d7a38b8 100644 --- a/src/yuzu/multiplayer/message.cpp +++ b/src/yuzu/multiplayer/message.cpp @@ -43,11 +43,8 @@ const ConnectionError ErrorManager::LOST_CONNECTION( QT_TR_NOOP("Connection to room lost. Try to reconnect.")); const ConnectionError ErrorManager::HOST_KICKED( QT_TR_NOOP("You have been kicked by the room host.")); -const ConnectionError ErrorManager::MAC_COLLISION( - QT_TR_NOOP("MAC address is already in use. Please choose another.")); -const ConnectionError ErrorManager::CONSOLE_ID_COLLISION(QT_TR_NOOP( - "Your Console ID conflicted with someone else's in the room.\n\nPlease go to Emulation " - "> Configure > System to regenerate your Console ID.")); +const ConnectionError ErrorManager::IP_COLLISION( + QT_TR_NOOP("IP address is already in use. Please choose another.")); const ConnectionError ErrorManager::PERMISSION_DENIED( QT_TR_NOOP("You do not have enough permission to perform this action.")); const ConnectionError ErrorManager::NO_SUCH_USER(QT_TR_NOOP( |