Merge branch 'blender-v3.3-release'

Conflicts:
	release/scripts/startup/bl_ui/space_userpref.py

2 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index e4c7572b9e4..11c3dfc18dc 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -768,19 +768,19 @@ static void fcm_cycles_evaluate(FCurve *UNUSED(fcu),
 }
 
 static FModifierTypeInfo FMI_CYCLES = {
-    FMODIFIER_TYPE_CYCLES,      /* type */
-    sizeof(FMod_Cycles),        /* size */
-    FMI_TYPE_EXTRAPOLATION,     /* action type */
-    FMI_REQUIRES_ORIGINAL_DATA, /* requirements */
-    N_("Cycles"),               /* name */
-    "FMod_Cycles",              /* struct name */
-    sizeof(tFCMED_Cycles),      /* storage size */
-    NULL,                       /* free data */
-    NULL,                       /* copy data */
-    fcm_cycles_new_data,        /* new data */
-    NULL /*fcm_cycles_verify*/, /* verify */
-    fcm_cycles_time,            /* evaluate time */
-    fcm_cycles_evaluate,        /* evaluate */
+    FMODIFIER_TYPE_CYCLES,                       /* type */
+    sizeof(FMod_Cycles),                         /* size */
+    FMI_TYPE_EXTRAPOLATION,                      /* action type */
+    FMI_REQUIRES_ORIGINAL_DATA,                  /* requirements */
+    CTX_N_(BLT_I18NCONTEXT_ID_ACTION, "Cycles"), /* name */
+    "FMod_Cycles",                               /* struct name */
+    sizeof(tFCMED_Cycles),                       /* storage size */
+    NULL,                                        /* free data */
+    NULL,                                        /* copy data */
+    fcm_cycles_new_data,                         /* new data */
+    NULL /*fcm_cycles_verify*/,                  /* verify */
+    fcm_cycles_time,                             /* evaluate time */
+    fcm_cycles_evaluate,                         /* evaluate */
 };
 
 /* Noise F-Curve Modifier  --------------------------- */
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index 3e5d997c873..d6caec86b5d 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -5519,7 +5519,7 @@ RenderSlot *BKE_image_add_renderslot(Image *ima, const char *name)
   }
   else {
     int n = BLI_listbase_count(&ima->renderslots) + 1;
-    BLI_snprintf(slot->name, sizeof(slot->name), "Slot %d", n);
+    BLI_snprintf(slot->name, sizeof(slot->name), DATA_("Slot %d"), n);
   }
   BLI_addtail(&ima->renderslots, slot);
   return slot;