From f7e4b209e241f8f97036a6a14c4993a38f2b5294 Mon Sep 17 00:00:00 2001
From: Yevgeny Makarov <jenkm>
Date: Wed, 28 Oct 2020 10:09:31 -0700
Subject: UI: Misc Label and Description Changes

Various changes to some labels and descriptions to be more accurate, clear, or less confusing.

Differential Revision: https://developer.blender.org/D8394

Reviewed by Hans Goudey
---
 source/blender/editors/space_info/info_stats.c    | 6 ++++--
 source/blender/makesrna/intern/rna_userdef.c      | 9 ++++-----
 source/blender/windowmanager/intern/wm_files.c    | 6 ++----
 source/blender/windowmanager/intern/wm_playanim.c | 2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'source')

diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index db8b6240558..bf21b383ba6 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -503,7 +503,7 @@ static void get_stats_string(
     else if (obedit->type == OB_ARMATURE) {
       *ofs += BLI_snprintf(info + *ofs,
                            len - *ofs,
-                           TIP_("Verts:%s/%s | Bones:%s/%s"),
+                           TIP_("Joints:%s/%s | Bones:%s/%s"),
                            stats_fmt->totvertsel,
                            stats_fmt->totvert,
                            stats_fmt->totbonesel,
@@ -664,6 +664,7 @@ void ED_info_draw_stats(
     EDGES,
     FACES,
     TRIS,
+    JOINTS,
     BONES,
     LAYERS,
     FRAMES,
@@ -678,6 +679,7 @@ void ED_info_draw_stats(
   STRNCPY(labels[EDGES], IFACE_("Edges"));
   STRNCPY(labels[FACES], IFACE_("Faces"));
   STRNCPY(labels[TRIS], IFACE_("Triangles"));
+  STRNCPY(labels[JOINTS], IFACE_("Joints"));
   STRNCPY(labels[BONES], IFACE_("Bones"));
   STRNCPY(labels[LAYERS], IFACE_("Layers"));
   STRNCPY(labels[FRAMES], IFACE_("Frames"));
@@ -709,7 +711,7 @@ void ED_info_draw_stats(
       stats_row(col1, labels[TRIS], col2, stats_fmt.tottri, NULL, y, height);
     }
     else if (obedit->type == OB_ARMATURE) {
-      stats_row(col1, labels[VERTS], col2, stats_fmt.totvertsel, stats_fmt.totvert, y, height);
+      stats_row(col1, labels[JOINTS], col2, stats_fmt.totvertsel, stats_fmt.totvert, y, height);
       stats_row(col1, labels[BONES], col2, stats_fmt.totbonesel, stats_fmt.totbone, y, height);
     }
     else {
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 3d389dd9b07..17fe5d90eca 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4389,7 +4389,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 
   static const EnumPropertyItem line_width[] = {
       {-1, "THIN", 0, "Thin", "Thinner lines than the default"},
-      {0, "AUTO", 0, "Auto", "Automatic line width based on UI scale"},
+      {0, "AUTO", 0, "Default", "Automatic line width based on UI scale"},
       {1, "THICK", 0, "Thick", "Thicker lines than the default"},
       {0, NULL, 0, NULL, NULL},
   };
@@ -4403,7 +4403,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
       {USER_RENDER_DISPLAY_SCREEN,
        "SCREEN",
        0,
-       "Full Screen",
+       "Maximized Area",
        "Images are rendered in a maximized Image Editor"},
       {USER_RENDER_DISPLAY_AREA,
        "AREA",
@@ -4421,7 +4421,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
       {USER_TEMP_SPACE_DISPLAY_FULLSCREEN,
        "SCREEN", /* Could be FULLSCREEN, but keeping it consistent with render_display_types */
        0,
-       "Full Screen",
+       "Maximized Area",
        "Open the temporary editor in a maximized screen"},
       {USER_TEMP_SPACE_DISPLAY_WINDOW,
        "WINDOW",
@@ -4453,8 +4453,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
   RNA_def_property_ui_text(
       prop,
       "UI Line Width",
-      "Changes the thickness of widget outlines, lines and points in the interface, "
-      "for high DPI displays");
+      "Changes the thickness of widget outlines, lines and dots in the interface");
   RNA_def_property_update(prop, 0, "rna_userdef_dpi_update");
 
   /* display */
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index a862d221815..87640999f08 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -3221,10 +3221,9 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C,
   char filename[FILE_MAX];
   if (blendfile_pathpath[0] != '\0') {
     BLI_split_file_part(blendfile_pathpath, filename, sizeof(filename));
-    BLI_path_extension_replace(filename, sizeof(filename), "");
   }
   else {
-    STRNCPY(filename, IFACE_("Untitled"));
+    STRNCPY(filename, IFACE_("untitled.blend"));
   }
   uiItemL(layout, filename, ICON_NONE);
 
@@ -3261,8 +3260,7 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C,
     char message[64];
     BLI_snprintf(message,
                  sizeof(message),
-                 (modified_images_count == 1) ? "Save %u modified image" :
-                                                "Save %u modified images",
+                 "Save %u modified image(s)",
                  modified_images_count);
     uiItemS_ex(layout, 2.0f);
     uiDefButBitC(block,
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index 5d1607fe506..ee6aee1fb7a 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -1274,7 +1274,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
     g_WS.ghost_system = GHOST_CreateSystem();
     GHOST_AddEventConsumer(g_WS.ghost_system, consumer);
 
-    playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y);
+    playanim_window_open("Blender Animation Player", start_x, start_y, ibuf->x, ibuf->y);
   }
 
   GHOST_GetMainDisplayDimensions(g_WS.ghost_system, &maxwinx, &maxwiny);
-- 
cgit v1.2.3