Updated trunk from branches.

git-svn-id: https://svn.blender.org/svnroot/bf-translations/trunk/locale@2172 a22679aa-88f2-e011-8c9d-001b2159fb48