blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Bastien Montagne 2021-11-02 17:05:03 +01:00
parent 2c23256288 dabfac37e3
commit 12bf4adbe3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bl_i18n_utils/settings.py
View File

@ -195,7 +195,7 @@ DOMAIN = "blender"
# Our own "gettext" stuff.
# File type (ext) to parse.
PYGETTEXT_ALLOWED_EXTS = {".c", ".cpp", ".cxx", ".hpp", ".hxx", ".h"}
PYGETTEXT_ALLOWED_EXTS = {".c", ".cc", ".cpp", ".cxx", ".hh", ".hpp", ".hxx", ".h"}
# Max number of contexts into a BLT_I18N_MSGID_MULTI_CTXT macro...
PYGETTEXT_MAX_MULTI_CTXT = 16

2
source/blender/editors/space_file/asset_catalog_tree_view.cc
View File

@ -370,7 +370,7 @@ std::string AssetCatalogDropController::drop_tooltip_asset_catalog(const wmDrag
AssetCatalog *src_catalog = catalog_service->find_catalog(catalog_drag->drag_catalog_id);
return std::string(TIP_("Move Catalog")) + " '" + src_catalog->path.name() + "' " +
IFACE_("into") + " '" + catalog_item_.get_name() + "'";
TIP_("into") + " '" + catalog_item_.get_name() + "'";
}
std::string AssetCatalogDropController::drop_tooltip_asset_list(const wmDrag &drag) const

4
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -1409,7 +1409,7 @@ static void panel_draw(const bContext *C, Panel *panel)
if (has_legacy_node) {
uiLayout *row = uiLayoutRow(layout, false);
uiItemL(row, IFACE_("Node tree has legacy node"), ICON_ERROR);
uiItemL(row, N_("Node tree has legacy node"), ICON_ERROR);
uiLayout *sub = uiLayoutRow(row, false);
uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_RIGHT);
uiItemO(sub, "", ICON_VIEWZOOM, "NODE_OT_geometry_node_view_legacy");
@ -1438,7 +1438,7 @@ static void output_attribute_panel_draw(const bContext *UNUSED(C), Panel *panel)
}
}
if (!has_output_attribute) {
uiItemL(layout, IFACE_("No group output attributes connected."), ICON_INFO);
uiItemL(layout, N_("No group output attributes connected"), ICON_INFO);
}
}