Commit: ed1ee89288e991965773d9623fe6f3fadd2eb61e
Author: Bastien Montagne
Date: Wed Nov 21 12:06:59 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBed1ee89288e991965773d9623fe6f3fadd2eb61e
I18N: tweak some UI labels and tips.
===================================================================
M release/scripts/modules/bl_i18n_utils/settings.py
M source/blender/blentranslation/intern/blt_lang.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py
b/release/scripts/modules/bl_i18n_utils/settings.py
index 150c2c36623..230c351d80c 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -44,7 +44,7 @@ LANGUAGES_CATEGORIES = (
)
LANGUAGES = (
# ID, UI english label, ISO code.
- (0, "Default (Default)", "DEFAULT"),
+ (0, "Automatic (Automatic)", "DEFAULT"),
(1, "English (English)", "en_US"),
(2, "Japanese (日本語)", "ja_JP"),
(3, "Dutch (Nederlandse taal)", "nl_NL"),
diff --git a/source/blender/blentranslation/intern/blt_lang.c
b/source/blender/blentranslation/intern/blt_lang.c
index f373ca24861..a36fe245a2a 100644
--- a/source/blender/blentranslation/intern/blt_lang.c
+++ b/source/blender/blentranslation/intern/blt_lang.c
@@ -157,9 +157,12 @@ static void fill_locales(void)
}
if (id == 0) {
- /* The DEFAULT item... */
+ /* The DEFAULT/Automatic
item... */
if (BLI_strnlen(loc, 2)) {
- locales[id] =
locales_menu[idx].description = BLI_strdup("");
+ locales[id] = "";
+ /* Keep this tip in
sync with the one in rna_userdef (rna_enum_language_default_items). */
+
locales_menu[idx].description = BLI_strdup("Automatically choose system's
defined language "
+
"if available, or fall-back to English");
}
/* Menu "label", not to be
stored in locales! */
else {
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index f1312eeaa2c..15618759ffa 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -81,7 +81,8 @@ const EnumPropertyItem rna_enum_navigation_mode_items[] = {
#if defined(WITH_INTERNATIONAL) || !defined(RNA_RUNTIME)
static const EnumPropertyItem rna_enum_language_default_items[] = {
- {0, "DEFAULT", 0, "Default (Default)", ""},
+ {0, "DEFAULT", 0, "Automatic (Automatic)",
+ "Automatically choose system's defined language if available, or
fall-back to English"},
{0, NULL, 0, NULL, NULL}
};
#endif
@@ -4196,12 +4197,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_struct_clear_flag(srna, STRUCT_UNDO);
RNA_def_struct_ui_text(srna, "System & OpenGL", "Graphics driver and
operating system settings");
- /* Language */
-
- prop = RNA_def_property(srna, "use_international_fonts", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "transopts",
USER_DOTRANSLATE);
- RNA_def_property_ui_text(prop, "International Fonts", "Use
international fonts");
- RNA_def_property_update(prop, NC_WINDOW, "rna_userdef_language_update");
+ /* UI settings. */
prop = RNA_def_property(srna, "ui_scale", PROP_FLOAT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -4246,7 +4242,12 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Author",
"Name that will be used in exported files when
format supports such feature");
- /* Language Selection */
+ /* Language. */
+
+ prop = RNA_def_property(srna, "use_international_fonts", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "transopts",
USER_DOTRANSLATE);
+ RNA_def_property_ui_text(prop, "Translate UI", "Enable UI translation
and use international fonts");
+ RNA_def_property_update(prop, NC_WINDOW, "rna_userdef_language_update");
prop = RNA_def_property(srna, "language", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_enum_language_default_items);
@@ -4258,17 +4259,21 @@ static void rna_def_userdef_system(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_translate_tooltips", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "transopts",
USER_TR_TOOLTIPS);
- RNA_def_property_ui_text(prop, "Translate Tooltips", "Translate
tooltips");
+ RNA_def_property_ui_text(prop, "Translate Tooltips",
+ "Translate the descriptions when hovering UI
elements (recommended)");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_translate_interface", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_IFACE);
- RNA_def_property_ui_text(prop, "Translate Interface", "Translate
interface");
+ RNA_def_property_ui_text(prop, "Translate Interface",
+ "Translate all labels in menus, buttons and
panels "
+ "(note that this might make it hard to follow
tutorials or the manual)");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_translate_new_dataname",
PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "transopts",
USER_TR_NEWDATANAME);
- RNA_def_property_ui_text(prop, "Translate New Names", "Translate new
data names (when adding/creating some)");
+ RNA_def_property_ui_text(prop, "Translate New Names",
+ "Translate the names of new data-blocks
(objects, materials...)");
RNA_def_property_update(prop, 0, "rna_userdef_update");
/* System & OpenGL */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
