lib/languages                     |    2 +-

 src/Messages.cpp                  |    4 ++--

 src/frontends/qt4/GuiWorkArea.cpp |    2 +-

 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/languages b/lib/languages

index 2756195..7a600ca 100644

--- a/lib/languages

+++ b/lib/languages

@@ -54,7 +54,7 @@ nynorsk     nynorsk	"Nynorsk"	false  iso8859-15 nn_NO	 ""

 polish      polish	"Polish"	false  iso8859-2  pl_PL	 ""

 portuguese  portuges	"Portuguese"	false  iso8859-15 pt_PT	 ""

 romanian    romanian	"Romanian"	false  iso8859-2  ro_RO	 ""

-russian     russian	"Russian"	false  koi8       ru_RU	 ""

+russian     russian	"Russian"	false  koi8-r     ru_RU	 ""

 scottish    scottish	"Scottish"	false  iso8859-15 gd_GB	 ""

 serbian     croatian	"Serbian"	false  iso8859-5  sr_HR  ""

 serbocroatian croatian	"Serbo-Croatian"	false iso8859-2  sh_HR	 ""

diff --git a/src/Messages.cpp b/src/Messages.cpp

index 66b974c..41b05cb 100644

--- a/src/Messages.cpp

+++ b/src/Messages.cpp

@@ -140,9 +140,9 @@ docstring const Messages::get(string const & m) const

 		// return what we got in.

 		boost::smatch sub;

 		if (regex_match(m, sub, reg))

-			translated = from_ascii(sub.str(1));

+			translated = from_utf8(sub.str(1));

 		else

-			translated = from_ascii(tmp);

+			translated = from_utf8(tmp);

 	} else {

 		LYXERR(Debug::DEBUG) << "We got a translation" << endl;

 		// m is actually not a char const * but ucs4 data

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp

index a6c08b1..5d9146e 100644

--- a/src/frontends/qt4/GuiWorkArea.cpp

+++ b/src/frontends/qt4/GuiWorkArea.cpp

@@ -557,13 +557,13 @@ void GuiWorkArea::paintEvent(QPaintEvent * ev)

 	*/

 	if (need_resize_) {

+		need_resize_ = false;

 		verticalScrollBar()->setPageStep(viewport()->height());

 		screen_ = QPixmap(viewport()->width(), viewport()->height());

 		resizeBufferView();

 		updateScreen();

 		WorkArea::hideCursor();

 		WorkArea::showCursor();

-		need_resize_ = false;

 	}

 	QPainter pain(viewport());