Merge remote-tracking branch 'origin/master'

2019-09-09 16:22:40 -04:00
parent 5a3fbf33df 5bed0f3bcc
commit 82493c596d
3 changed files with 5 additions and 5 deletions
--- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
@@ -178,7 +178,7 @@ public class LoadDialog extends FloatingDialog{
                        setup();
                    }catch(IOException e){
                        e.printStackTrace();
-                        ui.showException("save.import.fail", e);
+                        ui.showException("$save.import.fail", e);
                    }
                }else{
                    ui.showErrorMessage("$save.import.invalid");