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/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -168,7 +168,7 @@ public class AndroidLauncher extends AndroidApplication{
                                SaveSlot slot = control.saves.importSave(file);
                                ui.load.runLoadSave(slot);
                            }catch(IOException e){
-                                ui.showException("save.import.fail", e);
+                                ui.showException("$save.import.fail", e);
                            }
                        }else{
                            ui.showErrorMessage("$save.import.invalid");