From: Javier S. Pedro <maemo@javispedro.com>
Date: Sat, 3 Apr 2010 15:56:19 +0000 (+0200)
Subject: Merge branch 'master' of https://git.maemo.org/projects/drnoksnes
X-Git-Url: https://vcs.maemo.org/git/?p=drnoksnes;a=commitdiff_plain;h=6b862697b65da26c7c2c1fcbbe335760356c2d58

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

Conflicts:

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

6b862697b65da26c7c2c1fcbbe335760356c2d58
diff --cc gui/i18n/pl.po
index 5ffa03c,d56419e..a14bc83
--- a/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..."
 -