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/ios/src/io/anuke/mindustry/IOSLauncher.java
+++ b/ios/src/io/anuke/mindustry/IOSLauncher.java
@@ -173,10 +173,10 @@ public class IOSLauncher extends IOSApplication.Delegate{
                            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");
+                    ui.showErrorMessage("$save.import.invalid");
                }

            }
@@ -188,4 +188,4 @@ public class IOSLauncher extends IOSApplication.Delegate{
        UIApplication.main(argv, null, IOSLauncher.class);
        pool.close();
    }
-}
+}