summaryrefslogtreecommitdiffstats
path: root/tools/editor/plugins/resource_preloader_editor_plugin.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-21 22:34:55 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-21 22:34:55 -0300
commiteacb8f04c4697b8123afeec03088eebb3c4b20bd (patch)
tree8070f7807ec5d6a375df7184b151abbee8790608 /tools/editor/plugins/resource_preloader_editor_plugin.cpp
parenta75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff)
parent4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff)
downloadredot-engine-eacb8f04c4697b8123afeec03088eebb3c4b20bd.tar.gz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools/editor/plugins/resource_preloader_editor_plugin.cpp')
-rw-r--r--tools/editor/plugins/resource_preloader_editor_plugin.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp
index cc9aca1a25..cce0ba3d62 100644
--- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -72,7 +72,7 @@ void ResourcePreloaderEditor::_files_load_request(const Vector<String>& p_paths)
if (resource.is_null()) {
dialog->set_text(TTR("ERROR: Couldn't load resource!"));
dialog->set_title(TTR("Error!"));
- //dialog->get_cancel()->set_text(TTR("Close"));
+ //dialog->get_cancel()->set_text("Close");
dialog->get_ok()->set_text(TTR("Close"));
dialog->popup_centered_minsize();
return; ///beh should show an error i guess
@@ -169,7 +169,7 @@ void ResourcePreloaderEditor::_paste_pressed() {
if (!r.is_valid()) {
dialog->set_text(TTR("Resource clipboard is empty!"));
dialog->set_title(TTR("Error!"));
- //dialog->get_cancel()->set_text(TTR("Close"));
+ //dialog->get_cancel()->set_text("Close");
dialog->get_ok()->set_text(TTR("Close"));
dialog->popup_centered_minsize();
return; ///beh should show an error i guess
@@ -206,11 +206,11 @@ void ResourcePreloaderEditor::_delete_pressed() {
_delete_confirm_pressed(); //it has undo.. why bother with a dialog..
/*
- dialog->set_title(TTR("Confirm..."));
- dialog->set_text(TTR("Remove Resource '")+tree->get_selected()->get_text(0)+"' ?");
- //dialog->get_cancel()->set_text(TTR("Cancel"));
+ dialog->set_title("Confirm...");
+ dialog->set_text("Remove Resource '"+tree->get_selected()->get_text(0)+"' ?");
+ //dialog->get_cancel()->set_text("Cancel");
//dialog->get_ok()->show();
- dialog->get_ok()->set_text(TTR("Remove"));
+ dialog->get_ok()->set_text("Remove");
dialog->popup_centered(Size2(300,60));*/
}