Merged r7451 and r7454 from trunk.
Slovenian translation updated.
Contributed by Nejc Vidmar.
Authored by: tmaruyama 2011-09-22
Parent: [r7454]
Child: [r7456]