Merge branch 'master' of https://git.maemo.org/projects/drnoksnes

Conflicts:

	gui/i18n/pl.po
	gui/i18n/sv.po

diff --cc gui/i18n/pl.po
index 5ffa03c,d56419e..a14bc83
--- 1/gui/i18n/pl.po
--- 2/gui/i18n/pl.po
+++ b/gui/i18n/pl.po
@@@ -255,6 -273,7 +273,3 @@@ msgstr "Szybkie wczytanie 2
  #: buttons.inc:27
  msgid "Quick Save 2"
  msgstr "Szybki zapis 2"
--
--#~ msgid "Controls…"
--#~ msgstr "Sterowanie..."
 -