diff --git a/app/src/main/java/om/sstvencoder/Encoder.java b/app/src/main/java/om/sstvencoder/Encoder.java index 8050516..593cf81 100644 --- a/app/src/main/java/om/sstvencoder/Encoder.java +++ b/app/src/main/java/om/sstvencoder/Encoder.java @@ -66,7 +66,8 @@ class Encoder { mode = mQueue.remove(0); } mode.init(); - mProgressBar.begin(mode.getProcessCount(), "Sending..."); + mProgressBar.begin(mode.getProcessCount(), + mMessenger.getString(R.string.progressbar_message_sending)); while (mode.process()) { mProgressBar.step(); @@ -122,7 +123,8 @@ class Encoder { @Override public void run() { mode.init(); - mProgressBar2.begin(mode.getProcessCount(), context.getFileName() + " saving..."); + mProgressBar2.begin(mode.getProcessCount(), + mMessenger.getString(R.string.progressbar_message_saving_to_file, context.getFileName())); while (mode.process()) { mProgressBar2.step(); diff --git a/app/src/main/java/om/sstvencoder/MainActivityMessenger.java b/app/src/main/java/om/sstvencoder/MainActivityMessenger.java index bbc6140..9a6b3c9 100644 --- a/app/src/main/java/om/sstvencoder/MainActivityMessenger.java +++ b/app/src/main/java/om/sstvencoder/MainActivityMessenger.java @@ -36,4 +36,8 @@ class MainActivityMessenger { } }); } + + public String getString(int resId, Object... formatArgs) { + return mMainActivity.getString(resId, formatArgs); + } } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4d4a6a8..3cc084d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -19,6 +19,8 @@ 不受支持的内容 先前所使用的图像未能被加载 这个设备没有摄像头 + 发送… + %1$s 保存… 未能解析另一个活动 另一个活动未能被启动 发送邮件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 07a07b3..d5d7849 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,6 +47,8 @@ Unsupported content. Previous image could not be loaded. Device has no camera. + Sending… + %1$s saving… Another activity could not be resolved. Another activity could not be started. Send Email