svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-15 13:02:37 +00:00
parent e715a7185c 9648c6016b
commit 30293dc2ca
588 changed files with 42706 additions and 18021 deletions
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -46,7 +46,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):

            row = layout.row()
            if fluid is None:
-                row.label(_("built without fluids"))
+                row.label(_("Built without fluids"))
                return

            row.prop(fluid, "type")