\$ is just plain wrong
don't escape "

Ecaping " is unneeded when the url is in single quotes
have OS X open use single quotes too
escape single quotes correctly

It looks retarded, but it works, and apparently it's the correct way.
add a comment near the quote escaping code

Because it's very important.
merge

Conflicts:
	xlib/main.c
Add Makefile switch for DBUS
Get tox building configuration from pkg-config

Makes compiling against test and alternate versions easier. Example:
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/home/test-user/tox-install/lib/pkgconfig/" make PREFIX=/home/test-user/tox-install/
Update ui_strings.h

Add Chinese (Simplified) translation.
Update ui_dropdown.h

Add Chinese (Simplified).
Update ui.h

Add Chinese (Simplified)
Update main.c

Add Chinese (Simplified).
Update ui_strings.h

Update Error translation
Deal with FT_RENDER_MODE_MONO

Seems to be needed for bitmap fonts and fonts with embedded bitmaps.
For bitmap fonts, don't round width up to a multiple of 8
fix segfault when there are more than 128 log entries
Merge pull request #273 from tsudoko/xdg-open

URL opening fixes
Merge pull request #316 from hasufell/master

Add Makefile switch for DBUS
Merge pull request #330 from kaisfm/master

Add an Chinese (Simplified) Translation
Merge pull request #335 from doughdemon/bitmapfont

Deal with FT_RENDER_MODE_MONO