Merge remote-tracking branch 'origin/master'

5 files changed, 6 insertions, 6 deletions

diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp
index cc0db2da7..6a74cb1d9 100644
--- a/scene/2d/canvas_modulate.cpp
+++ b/scene/2d/canvas_modulate.cpp
@@ -62,7 +62,7 @@ String CanvasModulate::get_configuration_warning() const {
 	get_tree()->get_nodes_in_group("_canvas_modulate_"+itos(get_canvas().get_id()),&nodes);
 
 	if (nodes.size()>1) {
-		return TTR("Only one visible CanvasModulate is allowed per scene (or set of instanced scenes). The first one created will work, while the rest will be ignored.");
+		return TTR("Only one visible CanvasModulate is allowed per scene (or set of instanced scenes). The first created one will work, while the rest will be ignored.");
 	}
 
 	return String();
diff --git a/scene/2d/canvas_modulate.h b/scene/2d/canvas_modulate.h
index 73f920d5c..0445db27a 100644
--- a/scene/2d/canvas_modulate.h
+++ b/scene/2d/canvas_modulate.h
@@ -16,7 +16,7 @@ public:
 	void set_color(const Color& p_color);
 	Color get_color() const;
 
-	String CanvasModulate::get_configuration_warning() const;
+	String get_configuration_warning() const;
 
 	CanvasModulate();
 	~CanvasModulate();
diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp
index dee67a829..41ca7b1d0 100644
--- a/scene/2d/path_2d.cpp
+++ b/scene/2d/path_2d.cpp
@@ -243,7 +243,7 @@ String PathFollow2D::get_configuration_warning() const {
 		return String();
 
 	if (!get_parent() || !get_parent()->cast_to<Path2D>()) {
-		return TTR("PathFolow2D only works when set as a child of a Path2D node.");
+		return TTR("PathFollow2D only works when set as a child of a Path2D node.");
 	}
 
 	return String();
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index aebb9a4c2..3e6384ea2 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -540,7 +540,7 @@ String ViewportSprite::get_configuration_warning() const {
 			Viewport *vp = n->cast_to<Viewport>();
 			if (!vp->is_set_as_render_target()) {
 
-				return TTR("The Viewport set in the path property must be set as 'render taget' in order for this sprite to work");
+				return TTR("The Viewport set in the path property must be set as 'render target' in order for this sprite to work.");
 			}
 		}
 	}
diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp
index 2a5108c62..12524a219 100644
--- a/scene/2d/visibility_notifier_2d.cpp
+++ b/scene/2d/visibility_notifier_2d.cpp
@@ -347,11 +347,11 @@ void VisibilityEnabler2D::_node_removed(Node* p_node) {
 }
 
 String VisibilityEnabler2D::get_configuration_warning() const {
-
+#ifdef TOOLS_ENABLED
 	if (is_inside_tree() && get_parent() && (get_parent()->get_filename()==String() && get_parent()!=get_tree()->get_edited_scene_root())) {
 		return TTR("VisibilityEnable2D works best when used with the edited scene root directly as parent.");
 	}
-
+#endif
 	return String();
 }