Merged r7439 from trunk.
Slovenian translation of trunk r5957 and 1.2-stable r7434 updated.
Contributed by Nejc Vidmar.
Authored by: tmaruyama 2011-09-22
Parent: [r7441]
Child: [r7443]