Merge remote-tracking branch 'origin/master'

Conflicts:
	bstr.c
	bstr.h
	etc/input.conf
	input/input.c
	input/input.h
	libao2/ao_pulse.c
	libmpcodecs/vf_ass.c
	libmpcodecs/vf_vo.c
	libvo/gl_common.c
	libvo/x11_common.c
	mixer.c
	mixer.h
	mplayer.c

1 files changed, 2 insertions, 2 deletions

diff --git a/mp_msg.c b/mp_msg.c
index eafa6ac001..6ad39a0416 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -339,7 +339,7 @@ char *mp_gtext(const char *string)
      * couple of reasons (locale stuff is badly designed and sucks in
      * general).
      *
-     * First setting the locale, especially LC_CTYPE, changes the
+     * First, setting the locale, especially LC_CTYPE, changes the
      * behavior of various C functions and we don't want that - we
      * want isalpha() for example to always behave like in the C
      * locale.
@@ -361,7 +361,7 @@ char *mp_gtext(const char *string)
      * affect gettext itself because it supports specifying the
      * character set directly with bind_textdomain_codeset()).
      *
-     * So the only solution (at leat short of trying to work around
+     * So the only solution (at least short of trying to work around
      * things possibly producing non-utf-8 output) is to leave all the
      * locale variables unset. Note that this means it's not possible
      * to get translated output from any libraries we call if they