diff options
author | Alige <aligetmw@hotmail.fr> | 2014-10-23 18:50:19 +0300 |
---|---|---|
committer | Alige <aligetmw@hotmail.fr> | 2014-10-23 19:40:06 +0300 |
commit | a6094d662636e67b1515ad21e186041d8cf4cf26 (patch) | |
tree | fb43edb9c4b7c78e1dcfaf6bb733d384de214048 | |
parent | ad2b88808e5beb50505ae10f52d0dca780378d0c (diff) | |
download | manaplus-a6094d662636e67b1515ad21e186041d8cf4cf26.tar.gz manaplus-a6094d662636e67b1515ad21e186041d8cf4cf26.tar.bz2 manaplus-a6094d662636e67b1515ad21e186041d8cf4cf26.tar.xz manaplus-a6094d662636e67b1515ad21e186041d8cf4cf26.zip |
Changed all the "cant" by "can't", and fixed few sentences to translate.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | src/being/localplayer.cpp | 2 | ||||
-rw-r--r-- | src/gui/fonts/font.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/homunculushandler.cpp | 2 | ||||
-rw-r--r-- | src/resources/atlasmanager.cpp | 2 | ||||
-rw-r--r-- | src/resources/notifications.h | 24 | ||||
-rw-r--r-- | src/resources/openglimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/utils/glxhelper.cpp | 4 |
8 files changed, 20 insertions, 20 deletions
@@ -1831,7 +1831,7 @@ To add comment press right button on map arrow. To add home location, sit and press Set Home Location key ([5]). add: custom resolution. To change resolution, click on "custom" resolution. -add: auto change position if cant attack closed being. +add: auto change position if can't attack closed being. add: option to hide move path. add: change resolution in safe mode to 640x480. diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index eb4dfae4e..c3f267cb6 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -846,7 +846,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, const int amount, break; case Pickup::MAX_AMOUNT: // TRANSLATORS: pickup error message - msg = N_("You cant pickup this amount of items."); + msg = N_("You can't pickup this amount of items."); break; case Pickup::STACK_AMOUNT: // TRANSLATORS: pickup error message diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index 68f23d242..94b804fac 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -155,7 +155,7 @@ Font::~Font() TTF_Font *Font::openFont(const char *const name, const int size) { -// disabled for now because some systems like gentoo cant use it +// disabled for now because some systems like gentoo can't use it // #ifdef USE_SDL2 // SDL_RWops *const rw = MPHYSFSRWOPS_openRead(name); // if (!rw) diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp index 948da91f2..8796621f3 100644 --- a/src/net/eathena/homunculushandler.cpp +++ b/src/net/eathena/homunculushandler.cpp @@ -181,7 +181,7 @@ void HomunculusHandler::processHomunculusInfo(Net::MessageIn &msg) const int range = msg.readInt16("attack range"); HomunculusInfo *const info = PlayerInfo::getHomunculus(); - if (!info) // we cant find homunculus being because id is missing + if (!info) // we can't find homunculus being because id is missing return; Being *const dstBeing = actorManager->findBeing(info->id); diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index 8b1cfe374..26c40ed47 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -186,7 +186,7 @@ void AtlasManager::simpleSort(const std::string &restrict name, tempHeight = 0; } - // cant put image with this height + // can't put image with this height if (y + img->mBounds.h > size) { x = 0; diff --git a/src/resources/notifications.h b/src/resources/notifications.h index 0afe23d6f..4917835f6 100644 --- a/src/resources/notifications.h +++ b/src/resources/notifications.h @@ -44,11 +44,11 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"buy fail no money", // TRANSLATORS: notification message - N_("Unable to buy. You not have enought money."), + N_("Unable to buy. You don't have enough money."), NotifyFlags::EMPTY}, {"buy fail overweight", // TRANSLATORS: notification message - N_("Unable to buy. You overweight."), + N_("Unable to buy. It is too heavy."), NotifyFlags::EMPTY}, {"buy fail too many items", // TRANSLATORS: notification message @@ -84,7 +84,7 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"guild already", // TRANSLATORS: notification message - N_("You are already in guild."), + N_("You are already in a guild."), NotifyFlags::EMPTY}, {"guild create fail", // TRANSLATORS: notification message @@ -144,7 +144,7 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"party create failed", // TRANSLATORS: notification message - N_("Could not create party."), + N_("Couldn't create party."), NotifyFlags::EMPTY}, {"party created", // TRANSLATORS: notification message @@ -156,15 +156,15 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"party left deny", // TRANSLATORS: notification message - N_("You cant left party on this map."), + N_("You can't leave party on this map."), NotifyFlags::EMPTY}, {"party kicked", // TRANSLATORS: notification message - N_("You was kicked from party."), + N_("You were kicked from party."), NotifyFlags::EMPTY}, {"party kick deny", // TRANSLATORS: notification message - N_("You cant be kicked from party on this map."), + N_("You can't be kicked from party on this map."), NotifyFlags::EMPTY}, {"party user joined", // TRANSLATORS: notification message @@ -220,7 +220,7 @@ namespace NotifyManager NotifyFlags::PARTY_STRING}, {"party user left deny", // TRANSLATORS: notification message - N_("%s cant be kicked from party on this map."), + N_("%s can't be kicked from party on this map."), NotifyFlags::PARTY_STRING}, {"party user kicked", // TRANSLATORS: notification message @@ -228,7 +228,7 @@ namespace NotifyManager NotifyFlags::PARTY_STRING}, {"party user kick deny", // TRANSLATORS: notification message - N_("%s cant be kicked from party on this map."), + N_("%s can't be kicked from party on this map."), NotifyFlags::PARTY_STRING}, {"party unknown user msg", // TRANSLATORS: notification message @@ -404,7 +404,7 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"homunculus feed failed", // TRANSLATORS: notification message - N_("You cant feed homunculus, because not have %s."), + N_("You can't feed homunculus, because you don't have %s."), NotifyFlags::STRING}, {"card insert failed", // TRANSLATORS: notification message @@ -420,8 +420,8 @@ namespace NotifyManager NotifyFlags::EMPTY}, {"bank withdraw failed", // TRANSLATORS: notification message - N_("Withdraw failed. Probably you not have money " - "in bank for withdraw."), + N_("Withdraw failed. You probably don't have this " + "amount of money in the bank right now."), NotifyFlags::EMPTY} }; } // namespace NotifyManager diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index a51055842..295ad3e69 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -276,7 +276,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels); #ifdef DEBUG_OPENGL -// disabled for now, because debugger cant show it +// disabled for now, because debugger can't show it // if (isGLNotNull(mglLabelObject)) // { // const char *const text = "image text"; diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp index a5fbbb596..3ec3375d1 100644 --- a/src/utils/glxhelper.cpp +++ b/src/utils/glxhelper.cpp @@ -52,14 +52,14 @@ void *GlxHelper::createContext(const unsigned long window, || isGLNull(mglXCreateContextAttribs) || isGLNull(mglXChooseFBConfig)) { - logger->log("Cant change context, functions in driver " + logger->log("Can't change context, functions in driver " "not implimented"); XSetErrorHandler(handler); return context; } if (!context) { - logger->log("Cant change context, because current " + logger->log("Can't change context, because current " "context not created"); XSetErrorHandler(handler); return context; |