diff options
| author | Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar> | 2016-05-30 00:29:36 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar> | 2016-05-30 00:29:36 -0300 |
| commit | cf3575e0b4c5e73c6f8889bcf662906383021171 (patch) | |
| tree | a383abdd8706cb4a3d839f9a33fc0d2a7a6340f5 /tools/editor/io_plugins | |
| parent | 9b1f8230ec435d9289b53afa8da02367daf8b5af (diff) | |
| parent | e6e878e139eb48f587bf4f6e111b08ebf0121749 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/io_plugins')
| -rw-r--r-- | tools/editor/io_plugins/editor_scene_import_plugin.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp index 41dfb748fc..a461633dcc 100644 --- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp @@ -1235,18 +1235,18 @@ EditorSceneImportDialog::EditorSceneImportDialog(EditorNode *p_editor, EditorSce /* this_import = memnew( OptionButton ); - this_import->add_item(TTR("Overwrite Existing Scene")); - this_import->add_item(TTR("Overwrite Existing, Keep Materials")); - this_import->add_item(TTR("Keep Existing, Merge with New")); - this_import->add_item(TTR("Keep Existing, Ignore New")); - vbc->add_margin_child(TTR("This Time:"),this_import); + this_import->add_item("Overwrite Existing Scene"); + this_import->add_item("Overwrite Existing, Keep Materials"); + this_import->add_item("Keep Existing, Merge with New"); + this_import->add_item("Keep Existing, Ignore New"); + vbc->add_margin_child("This Time:",this_import); next_import = memnew( OptionButton ); - next_import->add_item(TTR("Overwrite Existing Scene")); - next_import->add_item(TTR("Overwrite Existing, Keep Materials")); - next_import->add_item(TTR("Keep Existing, Merge with New")); - next_import->add_item(TTR("Keep Existing, Ignore New")); - vbc->add_margin_child(TTR("Next Time:"),next_import); + next_import->add_item("Overwrite Existing Scene"); + next_import->add_item("Overwrite Existing, Keep Materials"); + next_import->add_item("Keep Existing, Merge with New"); + next_import->add_item("Keep Existing, Ignore New"); + vbc->add_margin_child("Next Time:",next_import); */ set_hide_on_ok(false); |