diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-17 17:28:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 17:28:55 +0200 |
| commit | 3b3ba7d179748d3b24fe457a67254db340ff8082 (patch) | |
| tree | d186d34b0fff10d047a0d22fd8f83e38dc5e8837 | |
| parent | 813c0d84740b1d1c8ccece3540e945d1e821561d (diff) | |
| parent | 340c2c0584b9751b4671a24458e7c5244c4bf64d (diff) | |
Merge pull request #29847 from yurchor/master
Fix minor typos
| -rw-r--r-- | editor/editor_autoload_settings.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_feature_profile.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/container.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index a7975c86c5..913eb35f8a 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -81,7 +81,7 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, Strin for (int i = 0; i < Variant::VARIANT_MAX; i++) { if (Variant::get_type_name(Variant::Type(i)) == p_name) { if (r_error) - *r_error = TTR("Invalid name.") + "\n" + TTR("Must not collide with an existing buit-in type name."); + *r_error = TTR("Invalid name.") + "\n" + TTR("Must not collide with an existing built-in type name."); return false; } diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 56358f059a..36a8772faf 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -721,7 +721,7 @@ void EditorFeatureProfileManager::_import_profiles(const Vector<String> &p_paths String dst_file = EditorSettings::get_singleton()->get_feature_profiles_dir().plus_file(basefile); if (FileAccess::exists(dst_file)) { - EditorNode::get_singleton()->show_warning(vformat(TTR("Profile '%s' already exists. Remote it first before importing, import aborted."), basefile.get_basename())); + EditorNode::get_singleton()->show_warning(vformat(TTR("Profile '%s' already exists. Remove it first before importing, import aborted."), basefile.get_basename())); return; } } diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 1f9bfb9936..c9cf5f8308 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -177,7 +177,7 @@ String Container::get_configuration_warning() const { if (warning != String()) { warning += "\n"; } - warning += TTR("Container by itself serves no purpose unless a script configures it's children placement behavior.\nIf you don't intend to add a script, then please use a plain 'Control' node instead."); + warning += TTR("Container by itself serves no purpose unless a script configures its children placement behavior.\nIf you don't intend to add a script, then please use a plain 'Control' node instead."); } return warning; } |