From f815c2ed01138ef1bd1b402b3a0257c120466c1d Mon Sep 17 00:00:00 2001 From: Eugenio Favalli Date: Mon, 9 Jan 2006 17:23:32 +0000 Subject: Fixed canceled/cancelled inconsistency. --- ChangeLog | 4 ++++ src/game.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7326d7cf..4f123f67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-09 Eugenio Favalli + + * src/game.cpp: Fixed canceled/cancelled inconsistency. + 2006-01-07 Eugenio Favalli * data/maps/new_9-1.tmx.gz: Crush fixed the issues reported on wiki. diff --git a/src/game.cpp b/src/game.cpp index aa77847d..e4064040 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1131,7 +1131,7 @@ void do_parse() BY_SERVER); break; case 2: // Invite request check failed... - chatWindow->chatLog("Trade cancelled due to an " + chatWindow->chatLog("Trade canceled due to an " "unknown reason.", BY_SERVER); break; case 3: // Trade accepted @@ -1141,8 +1141,8 @@ void do_parse() tradeWindow->setVisible(true); requestTradeDialogOpen = false; break; - case 4: // Trade cancelled - chatWindow->chatLog("Trade cancelled.", BY_SERVER); + case 4: // Trade canceled + chatWindow->chatLog("Trade canceled.", BY_SERVER); tradeWindow->setVisible(false); break; default: // Shouldn't happen as well, but to be sure -- cgit v1.2.3-70-g09d2