[Bf-blender-cvs] [beeb650940f] temp-checkbox-layout-tweaks: Merge branch 'master' into temp-checkbox-layout-tweaks

[Julian Eisel]

Commit: beeb650940fd584058a7173c03d9bacc43d91b3a
Author: Julian Eisel
Date:   Thu Apr 9 01:49:23 2020 +0200
Branches: temp-checkbox-layout-tweaks
https://developer.blender.org/rBbeeb650940fd584058a7173c03d9bacc43d91b3a

Merge branch 'master' into temp-checkbox-layout-tweaks

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index f8717e6f8a8,76e80fdb414..1ddd2b99c99
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -250,14 -246,14 +244,13 @@@ class USERPREF_PT_interface_translation
          prefs = context.preferences
          view = prefs.view
  
-         layout.active = view.use_international_fonts
- 
          layout.prop(view, "language")
  
 -        flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
 -        flow.active = (bpy.app.translations.locale != 'en_US')
 -
 -        flow.prop(view, "use_translate_tooltips", text="Tooltips")
 -        flow.prop(view, "use_translate_interface", text="Interface")
 -        flow.prop(view, "use_translate_new_dataname", text="New Data")
 +        col = layout.column(heading = "Affect")
++        col.active = (bpy.app.translations.locale != 'en_US')
 +        col.prop(view, "use_translate_tooltips", text="Tooltips")
 +        col.prop(view, "use_translate_interface", text="Interface")
 +        col.prop(view, "use_translate_new_dataname", text="New Data")
  
  
  class USERPREF_PT_interface_editors(InterfacePanel, CenterAlignMixIn, Panel):