[Bf-blender-cvs] [13b3869b5f3] userpref_redesign: Use term "Preferences" instead of "User Preferences" in the UI

[Julian Eisel]

Commit: 13b3869b5f38794451645726ee1e846d336f4ae7
Author: Julian Eisel
Date:   Fri Dec 21 00:24:04 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB13b3869b5f38794451645726ee1e846d336f4ae7

Use term "Preferences" instead of "User Preferences" in the UI

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/editors/interface/interface_ops.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 78d0e229d8c..b6b7b0861c4 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1828,9 +1828,9 @@ class USERPREF_PT_studiolight_add(PreferencePanel):
         userpref = context.user_preferences
 
         row = layout.row()
-        row.operator('wm.studiolight_install', icon='IMPORT', text="Add MatCap...").type = 'MATCAP'
-        row.operator('wm.studiolight_install', icon='IMPORT', text="Add LookDev HDRI...").type = 'WORLD'
-        op = row.operator('wm.studiolight_install', icon='IMPORT', text="Add Studio Light...")
+        row.operator("wm.studiolight_install", icon='IMPORT', text="Add MatCap...").type = 'MATCAP'
+        row.operator("wm.studiolight_install", icon='IMPORT', text="Add LookDev HDRI...").type = 'WORLD'
+        op = row.operator("wm.studiolight_install", icon='IMPORT', text="Add Studio Light...")
         op.type = 'STUDIO'
         op.filter_glob = ".sl"
 
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 1cb9f156eeb..484debf554c 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -1345,7 +1345,7 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
 		if (!BLI_is_dir(root)) {
 			BKE_report(
 			        op->reports, RPT_ERROR,
-			        "Please set your User Preferences' 'Translation Branches "
+			        "Please set your Preferences' 'Translation Branches "
 			        "Directory' path to a valid directory");
 			return OPERATOR_CANCELLED;
 		}
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index c994140d384..4193f0435bd 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -4733,7 +4733,7 @@ static void rna_def_space_userpref(BlenderRNA *brna)
 
 	srna = RNA_def_struct(brna, "SpaceUserPreferences", "Space");
 	RNA_def_struct_sdna(srna, "SpaceUserPref");
-	RNA_def_struct_ui_text(srna, "Space User Preferences", "User preferences space data");
+	RNA_def_struct_ui_text(srna, "Space Preferences", "Blender preferences space data");
 
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "filter_type");
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index e66fbd61c06..9c533a19116 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2086,7 +2086,7 @@ static void rna_def_userdef_theme_space_userpref(BlenderRNA *brna)
 	srna = RNA_def_struct(brna, "ThemeUserPreferences", NULL);
 	RNA_def_struct_sdna(srna, "ThemeSpace");
 	RNA_def_struct_clear_flag(srna, STRUCT_UNDO);
-	RNA_def_struct_ui_text(srna, "Theme User Preferences", "Theme settings for the User Preferences");
+	RNA_def_struct_ui_text(srna, "Theme Preferences", "Theme settings for the Blender Preferences");
 
 	rna_def_userdef_theme_spaces_main(srna);
 }
@@ -3207,7 +3207,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 		{9, "NODE_EDITOR", ICON_NODETREE, "Node Editor", ""},
 		{11, "PROPERTIES", ICON_PROPERTIES, "Properties", ""},
 		{12, "OUTLINER", ICON_OUTLINER, "Outliner", ""},
-		{14, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", ""},
+		{14, "USER_PREFERENCES", ICON_PREFERENCES, "Preferences", ""},
 		{15, "INFO", ICON_INFO, "Info", ""},
 		{16, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", ""},
 		{17, "CONSOLE", ICON_CONSOLE, "Python Console", ""},
@@ -3316,7 +3316,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "tuserpref");
 	RNA_def_property_struct_type(prop, "ThemeUserPreferences");
-	RNA_def_property_ui_text(prop, "User Preferences", "");
+	RNA_def_property_ui_text(prop, "Preferences", "");
 
 	prop = RNA_def_property(srna, "console", PROP_POINTER, PROP_NONE);
 	RNA_def_property_flag(prop, PROP_NEVER_NULL);
@@ -5085,7 +5085,7 @@ void RNA_def_userdef(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "userpref");
 	RNA_def_property_enum_items(prop, user_pref_sections);
 	RNA_def_property_ui_text(prop, "Active Section",
-	                         "Active section of the user preferences shown in the user interface");
+	                         "Active section of the preferences shown in the user interface");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	/* don't expose this directly via the UI, modify via an operator */
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 23c60c33d61..b5547c11782 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1684,7 +1684,7 @@ void WM_OT_save_userpref(wmOperatorType *ot)
 {
 	ot->name = "Save Preferences";
 	ot->idname = "WM_OT_save_userpref";
-	ot->description = "Save user preferences separately, overrides startup file preferences";
+	ot->description = "Save preferences separately, overrides startup file preferences";
 
 	ot->invoke = WM_operator_confirm;
 	ot->exec = wm_userpref_write_exec;
@@ -1825,7 +1825,7 @@ void WM_OT_read_factory_settings(wmOperatorType *ot)
 
 	ot->name = "Load Factory Settings";
 	ot->idname = "WM_OT_read_factory_settings";
-	ot->description = "Load default file and user preferences";
+	ot->description = "Load default file and preferences";
 
 	ot->invoke = WM_operator_confirm;
 	ot->exec = wm_homefile_read_exec;