Adjust makefile for mac-specific ncurses library naming.
Allow disabling gettext dependency.
Remove redundant include of clocale, thanks wito.
Flip NONLOCALIZED define to LOCALIZE, and pass it in to compile jobs.
Update calendar.cpp

Make the compiler happy when building with localization disabled.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Further conditioniolize gettext compilation.
Fix a casting warning.
Conditionalize yet more of the makefiles.
Updated codeblocks project for non-localization
Merge conditional compilation of gettext.

Conflicts:
	Makefile
	Makefile.Windows
Fix up localization include that crept in.
Millisecond timestamps for dbg
Added adrenaline shot item.
uimenu_entry: add optional 'extratxt' variable for secondary text (such as symbol placement)
int entry.left: offset from left edge of main entry text
nc_color entry.color: color of text
std::string txt: the text itself.

For example, see 'editmap' class
Map editor: Move into editmap class, fixed fields, added furniture, added line/rectangle/circle drawing of terrain/fields/traps/etc.

Completely functional, however some UI details may change, in particular switching between shape resizing / movement and tile selection
Initial work on a CMakeLists.txt for cataclysm.
editmap: fix reversed "J" and "K" movement keys
editmap: adjust help strings