summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-01-09 17:23:32 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-01-09 17:23:32 +0000
commitf815c2ed01138ef1bd1b402b3a0257c120466c1d (patch)
treeb65dc764e233cf96cb28e84899626c1a178bf27f /src
parent071877484ef493631592d9f10b6c4457097eca29 (diff)
downloadmana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.gz
mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.bz2
mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.xz
mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.zip
Fixed canceled/cancelled inconsistency.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp6
1 files changed, 3 insertions, 3 deletions
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