From 8daac61f3a30a14f3d5b456f1fad54619c7acb37 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Sun, 10 Dec 2023 15:56:07 +0800
Subject: [PATCH 1/8] Added Chinese-Simplified

---
 app/src/main/res/values-zh-rCN/strings.xml | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/src/main/res/values-zh-rCN/strings.xml

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..ecd003c
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SSTV编码器</string>
+    <string name="action_pick_picture">选择照片</string>
+    <string name="action_take_picture">拍摄照片</string>
+    <string name="action_save_wave">保存为波形(.wav)文件</string>
+    <string name="action_stop">停止</string>
+    <string name="action_play">播放</string>
+    <string name="action_transform">更改图片</string>
+    <string name="action_rotate">旋转</string>
+    <string name="action_reset">重置</string>
+    <string name="action_done">完成</string>
+    <string name="action_modes">编码模式</string>
+    <string name="action_privacy_policy">隐私政策</string>
+    <string name="action_privacy_policy_text">\n        SSTV编码器可以将图片转换为音频\n        \n\n为实现转换功能，图像会被暂时载入内存.\n        \n\n图像可以被缩放或者选择. 别担心，此软件内对于图像的更改不会被保存. 最后一次使用的图片的路径会保存在软件的本地存储.\n        \n\n此外你还可以在图片上附加文字信息. 它也会保存在软件的本地存储.\n        \n\n附加的文字信息也会在用户选择的模式下编码入音频中. 选中的模式也会存储在软件中.\n        \n\n生成的音频不仅可以在软件内通过按下“播放”按钮进行播放，还可以按下“保存”按钮存储在手机的存储空间.</string>
+    <string name="action_about">关于SSTV编码器</string>
+    <string name="action_about_text">"\n        SSTV Encoder %1$s\n版权所有 2017 Olga Miller\n        \n\nSSTV 编码器通过慢扫描电视/Slow Scan Television (SSTV)发送图片.\n        \n\n要获取详细信息，请参阅本软件源码: \nhttps://github.com/olgamiller/SSTVEncoder2\n        \n\nDISCLAIMER:\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n    "</string>
+    <string name="load_img_err_title">加载图像时出错</string>
+    <string name="load_img_orientation_err_title">定位图像时出错</string>
+    <string name="load_img_err_txt_unsupported">不受支持的内容</string>
+    <string name="message_prev_img_not_loaded">先前所使用的图像未能被加载</string>
+    <string name="message_no_camera">这个设备没有摄像头╮(╯-╰)╭</string>
+    <string name="another_activity_resolve_err">未能解析另一个活动</string>
+    <string name="another_activity_start_err">另一个活动未能被启动</string>
+    <string name="btn_send_email">发送邮件</string>
+    <string name="btn_ok">好的</string>
+    <string name="email_subject">SSTV编码器 - BUG反馈</string>
+    <string name="chooser_title">发送BUG反馈</string>
+    <string name="bold">粗体</string>
+    <string name="italic">斜体</string>
+    <string name="outline">下划线</string>
+    <string name="color">字体颜色</string>
+    <string name="outline_color">下划线颜色</string>
+    <string name="size">字体大小</string>
+    <string name="font">字体</string>
+    <string name="text">文本</string>
+</resources>
\ No newline at end of file

From f9a48b5274ca0d66de7cb84b21db06d4728b3411 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Sun, 10 Dec 2023 15:56:28 +0800
Subject: [PATCH 2/8] Check some untranslatable strings

---
 app/src/main/res/values/strings.xml | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5bbf7e..c56af1f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,21 +11,21 @@
     <string name="action_reset">Reset</string>
     <string name="action_done">Done</string>
     <string name="action_modes">Modes</string>
-    <string name="action_martin1">Martin 1</string>
-    <string name="action_martin2">Martin 2</string>
-    <string name="action_pd50">PD 50</string>
-    <string name="action_pd90">PD 90</string>
-    <string name="action_pd120">PD 120</string>
-    <string name="action_pd160">PD 160</string>
-    <string name="action_pd180">PD 180</string>
-    <string name="action_pd240">PD 240</string>
-    <string name="action_pd290">PD 290</string>
-    <string name="action_scottie1">Scottie 1</string>
-    <string name="action_scottie2">Scottie 2</string>
-    <string name="action_scottie_dx">Scottie DX</string>
-    <string name="action_robot36">Robot 36</string>
-    <string name="action_robot72">Robot 72</string>
-    <string name="action_wraaseSC2_180">Wraase SC2 180</string>
+    <string name="action_martin1" translatable="false">Martin 1</string>
+    <string name="action_martin2" translatable="false">Martin 2</string>
+    <string name="action_pd50" translatable="false">PD 50</string>
+    <string name="action_pd90" translatable="false">PD 90</string>
+    <string name="action_pd120" translatable="false">PD 120</string>
+    <string name="action_pd160" translatable="false">PD 160</string>
+    <string name="action_pd180" translatable="false">PD 180</string>
+    <string name="action_pd240" translatable="false">PD 240</string>
+    <string name="action_pd290" translatable="false">PD 290</string>
+    <string name="action_scottie1" translatable="false">Scottie 1</string>
+    <string name="action_scottie2" translatable="false">Scottie 2</string>
+    <string name="action_scottie_dx" translatable="false">Scottie DX</string>
+    <string name="action_robot36" translatable="false">Robot 36</string>
+    <string name="action_robot72" translatable="false">Robot 72</string>
+    <string name="action_wraaseSC2_180" translatable="false">Wraase SC2 180</string>
     <string name="action_privacy_policy">Privacy Policy</string>
     <string name="action_privacy_policy_text">
         SSTV Encoder converts images to audio.

From 8f0bf4c3ca67f68f6391aa2ce5bfd305333fa6eb Mon Sep 17 00:00:00 2001
From: Weiguangtwk <41853928+WeiguangTWK@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:24:46 +0800
Subject: [PATCH 3/8] Update strings.xml according to comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

App name translation is removed, translation about 'outline' is corrected

ps: “轮廓线” means same as “描边” so I choose easy understanding “描边”
---
 app/src/main/res/values-zh-rCN/strings.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ecd003c..2bdd78e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">SSTV编码器</string>
     <string name="action_pick_picture">选择照片</string>
     <string name="action_take_picture">拍摄照片</string>
     <string name="action_save_wave">保存为波形(.wav)文件</string>
@@ -12,26 +11,26 @@
     <string name="action_done">完成</string>
     <string name="action_modes">编码模式</string>
     <string name="action_privacy_policy">隐私政策</string>
-    <string name="action_privacy_policy_text">\n        SSTV编码器可以将图片转换为音频\n        \n\n为实现转换功能，图像会被暂时载入内存.\n        \n\n图像可以被缩放或者选择. 别担心，此软件内对于图像的更改不会被保存. 最后一次使用的图片的路径会保存在软件的本地存储.\n        \n\n此外你还可以在图片上附加文字信息. 它也会保存在软件的本地存储.\n        \n\n附加的文字信息也会在用户选择的模式下编码入音频中. 选中的模式也会存储在软件中.\n        \n\n生成的音频不仅可以在软件内通过按下“播放”按钮进行播放，还可以按下“保存”按钮存储在手机的存储空间.</string>
-    <string name="action_about">关于SSTV编码器</string>
-    <string name="action_about_text">"\n        SSTV Encoder %1$s\n版权所有 2017 Olga Miller\n        \n\nSSTV 编码器通过慢扫描电视/Slow Scan Television (SSTV)发送图片.\n        \n\n要获取详细信息，请参阅本软件源码: \nhttps://github.com/olgamiller/SSTVEncoder2\n        \n\nDISCLAIMER:\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n    "</string>
+    <string name="action_privacy_policy_text">\n        SSTV Encoder可以将图片转换为音频\n        \n\n为实现转换功能，图像会被暂时载入内存.\n        \n\n图像可以被缩放或者选择. 别担心，此软件内对于图像的更改不会被保存. 最后一次使用的图片的路径会保存在软件的本地存储.\n        \n\n此外你还可以在图片上附加文字信息. 它也会保存在软件的本地存储.\n        \n\n附加的文字信息也会在用户选择的模式下编码入音频中. 选中的模式也会存储在软件中.\n        \n\n生成的音频不仅可以在软件内通过按下“播放”按钮进行播放，还可以按下“保存”按钮存储在手机的存储空间.</string>
+    <string name="action_about">关于SSTV Encoder</string>
+    <string name="action_about_text">"\n        SSTV Encoder %1$s\n版权所有 2017 Olga Miller\n        \n\nSSTV Encoder通过慢扫描电视/Slow Scan Television (SSTV)发送图片.\n        \n\n要获取详细信息，请参阅本软件源码: \nhttps://github.com/olgamiller/SSTVEncoder2\n        \n\nDISCLAIMER:\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n    "</string>
     <string name="load_img_err_title">加载图像时出错</string>
     <string name="load_img_orientation_err_title">定位图像时出错</string>
     <string name="load_img_err_txt_unsupported">不受支持的内容</string>
     <string name="message_prev_img_not_loaded">先前所使用的图像未能被加载</string>
-    <string name="message_no_camera">这个设备没有摄像头╮(╯-╰)╭</string>
+    <string name="message_no_camera">这个设备没有摄像头</string>
     <string name="another_activity_resolve_err">未能解析另一个活动</string>
     <string name="another_activity_start_err">另一个活动未能被启动</string>
     <string name="btn_send_email">发送邮件</string>
     <string name="btn_ok">好的</string>
-    <string name="email_subject">SSTV编码器 - BUG反馈</string>
+    <string name="email_subject">SSTV Encoder - BUG反馈</string>
     <string name="chooser_title">发送BUG反馈</string>
     <string name="bold">粗体</string>
     <string name="italic">斜体</string>
-    <string name="outline">下划线</string>
+    <string name="outline">描边</string>
     <string name="color">字体颜色</string>
-    <string name="outline_color">下划线颜色</string>
+    <string name="outline_color">描边颜色</string>
     <string name="size">字体大小</string>
     <string name="font">字体</string>
     <string name="text">文本</string>
-</resources>
\ No newline at end of file
+</resources>

From b21f5ba89f05b7f2e3ee9512f74399fa087f9c07 Mon Sep 17 00:00:00 2001
From: Weiguangtwk <41853928+WeiguangTWK@users.noreply.github.com>
Date: Sun, 10 Dec 2023 18:27:48 +0800
Subject: [PATCH 4/8] Update strings.xml 2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove unnecessary string “别担心”
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2bdd78e..e66b6bc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,7 +11,7 @@
     <string name="action_done">完成</string>
     <string name="action_modes">编码模式</string>
     <string name="action_privacy_policy">隐私政策</string>
-    <string name="action_privacy_policy_text">\n        SSTV Encoder可以将图片转换为音频\n        \n\n为实现转换功能，图像会被暂时载入内存.\n        \n\n图像可以被缩放或者选择. 别担心，此软件内对于图像的更改不会被保存. 最后一次使用的图片的路径会保存在软件的本地存储.\n        \n\n此外你还可以在图片上附加文字信息. 它也会保存在软件的本地存储.\n        \n\n附加的文字信息也会在用户选择的模式下编码入音频中. 选中的模式也会存储在软件中.\n        \n\n生成的音频不仅可以在软件内通过按下“播放”按钮进行播放，还可以按下“保存”按钮存储在手机的存储空间.</string>
+    <string name="action_privacy_policy_text">\n        SSTV Encoder可以将图片转换为音频\n        \n\n为实现转换功能，图像会被暂时载入内存.\n        \n\n图像可以被缩放或者选择. 此软件内对于图像的更改不会被保存. 最后一次使用的图片的路径会保存在软件的本地存储.\n        \n\n此外你还可以在图片上附加文字信息. 它也会保存在软件的本地存储.\n        \n\n附加的文字信息也会在用户选择的模式下编码入音频中. 选中的模式也会存储在软件中.\n        \n\n生成的音频不仅可以在软件内通过按下“播放”按钮进行播放，还可以按下“保存”按钮存储在手机的存储空间.</string>
     <string name="action_about">关于SSTV Encoder</string>
     <string name="action_about_text">"\n        SSTV Encoder %1$s\n版权所有 2017 Olga Miller\n        \n\nSSTV Encoder通过慢扫描电视/Slow Scan Television (SSTV)发送图片.\n        \n\n要获取详细信息，请参阅本软件源码: \nhttps://github.com/olgamiller/SSTVEncoder2\n        \n\nDISCLAIMER:\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n    "</string>
     <string name="load_img_err_title">加载图像时出错</string>

From aeebe14341abb15ac3ba7adf2dd8713960ef9e81 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Sat, 16 Dec 2023 20:44:45 +0800
Subject: [PATCH 5/8] Fix: app_name is not translatable

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c56af1f..fb82229 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">SSTV Encoder</string>
+    <string name="app_name" translatable="false">SSTV Encoder</string>
     <string name="action_pick_picture">Pick Picture</string>
     <string name="action_take_picture">Take Picture</string>
     <string name="action_save_wave">Save as WAVE File</string>

From 39c69a35ba98b9a713af775739ab03a9cabee792 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Mon, 18 Dec 2023 07:04:47 +0800
Subject: [PATCH 6/8] Update translation

---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e66b6bc..49cbcc9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,9 +28,9 @@
     <string name="bold">粗体</string>
     <string name="italic">斜体</string>
     <string name="outline">描边</string>
-    <string name="color">字体颜色</string>
+    <string name="color">颜色</string>
     <string name="outline_color">描边颜色</string>
-    <string name="size">字体大小</string>
+    <string name="size">大小</string>
     <string name="font">字体</string>
     <string name="text">文本</string>
 </resources>

From 1617ec117e255579e740cc36740400bff070d041 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Mon, 18 Dec 2023 07:17:02 +0800
Subject: [PATCH 7/8] Update translation and add new string

---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 app/src/main/res/values/strings.xml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 49cbcc9..072c642 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -33,4 +33,5 @@
     <string name="size">大小</string>
     <string name="font">字体</string>
     <string name="text">文本</string>
+    <string name="outline_size">描边大小</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb82229..2b3d86a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,4 +61,5 @@
     <string name="size">Size</string>
     <string name="font">Font</string>
     <string name="text">Text</string>
+    <string name="outline_size">Outline size</string>
 </resources>
\ No newline at end of file

From 12b17a5276e89e5ccbeaea02b082def696deef39 Mon Sep 17 00:00:00 2001
From: WeiguangTWK <weiguangtwk@outlook.com>
Date: Mon, 18 Dec 2023 07:17:25 +0800
Subject: [PATCH 8/8] Apply new string to Edit_text site

---
 app/src/main/res/layout/activity_edit_text.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_edit_text.xml b/app/src/main/res/layout/activity_edit_text.xml
index 07259bd..46d45e9 100644
--- a/app/src/main/res/layout/activity_edit_text.xml
+++ b/app/src/main/res/layout/activity_edit_text.xml
@@ -91,7 +91,7 @@
 
             <TextView
                 android:id="@+id/text_outline_size"
-                android:text="@string/size"/>
+                android:text="@string/outline_size" />
 
             <Spinner
                 android:id="@+id/edit_outline_size"
@@ -126,7 +126,7 @@
 
             <TextView
                 android:id="@+id/text_outline_color"
-                android:text="@string/color"/>
+                android:text="@string/outline_color" />
 
             <LinearLayout
                 android:clickable="true"