Merge lp:~widelands-dev/widelands/wrong-password-message into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9121
Proposed branch: lp:~widelands-dev/widelands/wrong-password-message
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/network/internet_gaming_messages.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/wrong-password-message
Reviewer Review Type Date Requested Status
Toni Förster Approve
Review via email: mp+367929@code.launchpad.net

Commit message

Improved message for "wrong password"

Description of the change

The player does not care about the technical detail that it has been "sent", and the new phrasing that I chose is more common.

To post a comment you must log in.
Revision history for this message
Toni Förster (stonerl) :
review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5039. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/537113797.
Appveyor build 4819. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_wrong_password_message-4819.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/network/internet_gaming_messages.cc'
2--- src/network/internet_gaming_messages.cc 2019-02-23 11:00:49 +0000
3+++ src/network/internet_gaming_messages.cc 2019-05-25 08:30:43 +0000
4@@ -42,7 +42,7 @@
5 // clients.
6 igmessages["NO_SUCH_USER"] = _("There is no user with this name logged in.");
7 igmessages["NO_SUCH_GAME"] = _("The game no longer exists, maybe it has just been closed.");
8- igmessages["WRONG_PASSWORD"] = _("The sent password was incorrect!");
9+ igmessages["WRONG_PASSWORD"] = _("Wrong password, please try again.");
10 igmessages["UNSUPPORTED_PROTOCOL"] = _("The protocol version you are using is not supported!");
11 igmessages["ALREADY_LOGGED_IN"] = _("You are already logged in!");
12 igmessages["DEFICIENT_PERMISSION"] =

Subscribers

People subscribed via source and target branches

to status/vote changes: