1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.5-release'

Browse Source
This commit is contained in:
Bastien Montagne 2023-03-07 11:06:19 +01:00
commit 067fc67bdd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/properties.py
View File

@ -1673,7 +1673,7 @@ class CyclesPreferences(bpy.types.AddonPreferences):
driver_version = "470" driver_version = "470"
col.label(text=iface_("Requires NVIDIA GPU with compute capability %s") % compute_capability, col.label(text=iface_("Requires NVIDIA GPU with compute capability %s") % compute_capability,
icon='BLANK1', translate=False) icon='BLANK1', translate=False)
col.label(text="and NVIDIA driver version %s or newer" % driver_version, col.label(text=iface_("and NVIDIA driver version %s or newer") % driver_version,
icon='BLANK1', translate=False) icon='BLANK1', translate=False)
elif device_type == 'HIP': elif device_type == 'HIP':
if True: if True:
@ -1719,7 +1719,8 @@ class CyclesPreferences(bpy.types.AddonPreferences):
.replace('(TM)', unicodedata.lookup('TRADE MARK SIGN')) .replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
.replace('(tm)', unicodedata.lookup('TRADE MARK SIGN')) .replace('(tm)', unicodedata.lookup('TRADE MARK SIGN'))
.replace('(R)', unicodedata.lookup('REGISTERED SIGN')) .replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
.replace('(C)', unicodedata.lookup('COPYRIGHT SIGN')) .replace('(C)', unicodedata.lookup('COPYRIGHT SIGN')),
translate=False
) )
def draw_impl(self, layout, context): def draw_impl(self, layout, context):

9
scripts/modules/bl_i18n_utils/bl_extract_messages.py
View File

@ -690,6 +690,15 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
else: else:
continue continue
# Skip function if it's marked as not translatable.
do_translate = True
for kw in node.keywords:
if kw.arg == "translate" and not kw.value.value:
do_translate = False
break
if not do_translate:
continue
func_args = func_translate_args.get(func_id, {}) func_args = func_translate_args.get(func_id, {})
# First try to get i18n contexts, for every possible msgid id. # First try to get i18n contexts, for every possible msgid id.