Merge branch 'ypots'

Conflicts:
	iuse.cpp

bionics.cpp

@@ -423,9 +423,9 @@ bool player::install_bionics(game *g, it_bionic* type)
  if (type->id == itm_bionics_battery) {	// No selection list; just confirm
   mvwprintz(w,  2, 0, h_ltblue, "Battery Level +%d", BATTERY_AMOUNT);
   mvwprintz(w, 22, 0, c_ltblue, "\
-Installing this bionic will increase your total battery capacity by 10.\n\
+Installing this bionic will increase your total battery capacity by %d.\n\
 Batteries are necessary for most bionics to function.  They also require a\n\
-charge mechanism, which must be installed from another CBM.");
+charge mechanism, which must be installed from another CBM.", BATTERY_AMOUNT);
   char ch;
   wrefresh(w);
   do

item.cpp

@@ -369,7 +369,7 @@ std::string item::info(bool showtext)
   if (mod->damage != 0)
    dump << "\n Damage: " << (mod->damage > 0 ? "+" : "") << int(mod->damage);
   if (mod->clip != 0)
-   dump << "\n Clip: " << (mod->clip > 0 ? "+" : "") << int(mod->damage) << "%";
+   dump << "\n Magazine: " << (mod->clip > 0 ? "+" : "") << int(mod->damage) << "%";
   if (mod->recoil != 0)
    dump << "\n Recoil: " << int(mod->recoil);
   if (mod->burst != 0)

itypedef.cpp

@@ -378,7 +378,7 @@ Eating this would be pretty gross.  It causes you to mutate.");
 
 FOOD("ant egg",		 5, 80,	c_white,	FLESH,	itm_null,
     4,  2, 10, 100, 0,  0, -1,  0,  1, -10,	&iuse::none,	ADD_NULL, "\
-A large ant egg, the size of a softball.  Extremely nutrtious, but gross.");
+A large ant egg, the size of a softball.  Extremely nutritious, but gross.");
 
 FOOD("marloss berry",	 2,600, c_pink,		VEGGY,	itm_null,
     1,  1, 20, 40,  0,  0,-10,  0,  1, 30,	&iuse::marloss,	ADD_NULL, "\
@@ -2491,15 +2491,15 @@ Rifling a shotgun barrel is mainly done in order to improve its accuracy when\n\
 firing slugs.  The rifling makes the gun less suitable for shot, however.",
 0);
 
-GUNMOD("extended clip",	  8,  560, c_ltgray, STEEL, PLASTIC,  1,  1, -2,  0, -1,
+GUNMOD("extended magazine",	  8,  560, c_ltgray, STEEL, PLASTIC,  1,  1, -2,  0, -1,
 	-1,  0,  0, 50,  0,  0, AT_NULL,	true,	true,	true,	true,
 	0, "\
 Increases the ammunition capacity of your firearm by 50%, but the added bulk\n\
 reduces accuracy slightly.",
 0);
 
 //	NAME      	 RAR  PRC  COLOR     MAT1   MAT2     VOL WGT DAM CUT HIT
-GUNMOD("double clip",	   4, 720, c_ltgray, STEEL, PLASTIC,  2,  2,  0,  0,  0,
+GUNMOD("double magazine",	   4, 720, c_ltgray, STEEL, PLASTIC,  2,  2,  0,  0,  0,
 //	ACC DAM NOI CLP REC BST NEWTYPE,	PISTOL	SHOT	SMG	RIFLE
 	-2,  0,  0,100,  2,  0, AT_NULL,	false,	true,	true,	true,
 	0, "\

iuse.cpp

@@ -926,7 +926,7 @@ void iuse::water_purifier(game *g, player *p, item *it, bool t)
 {
  char ch = g->inv("Purify what?");
  if (!p->has_item(ch)) {
-  g->add_msg_if_player(p,"You do not have that idea!");
+  g->add_msg_if_player(p,"You do not have that item!");
   return;
  }
  if (p->i_at(ch).contents.size() == 0) {

map.cpp

@@ -270,7 +270,7 @@ bool map::displace_vehicle (game *g, int &x, int &y, int dx, int dy, bool test=f
   // and precalc_dx/dy[1] should contain next direction
   psg->posx += dx + veh->parts[p].precalc_dx[1] - veh->parts[p].precalc_dx[0];
   psg->posy += dy + veh->parts[p].precalc_dy[1] - veh->parts[p].precalc_dy[0];
-  if (psg == &g->u) { // if passemger is you, we need to update the map
+  if (psg == &g->u) { // if passenger is you, we need to update the map
    need_update = true;
    upd_x = psg->posx;
    upd_y = psg->posy;

player.cpp

@@ -4259,7 +4259,7 @@ press 'U' while wielding the unloaded gun.", gun->tname(g).c_str());
    } else if ((mod->id == itm_clip || mod->id == itm_clip2) &&
               (gun->contents[i].type->id == itm_clip ||
                gun->contents[i].type->id == itm_clip2)) {
-    g->add_msg("Your %s already has its clip size extended.",
+    g->add_msg("Your %s already has its magazine size extended.",
                gun->tname(g).c_str());
     if (replace_item)
      inv.add_item(copy);