Merge pull request #199 from Young-Lord/master

rosuH · web-flow · commit c85aefd69a32 · 2022-08-10T09:50:06.000+08:00
diff --git a/PrivacyPolicy.md b/PrivacyPolicy.md
@@ -21,7 +21,7 @@ We don't collect information voluntarily at all. But if, after a crash, you volu
 
 <h3> Third, how we share, transfer, and publicly disclose your personal information</h3>
 We don't actively collect information at all. And no personal information about you, so don't worry.
-But if, after a crash, you actively send us information about your device, we'll use it for nothing more than locating and resolving your crash (which may appear in Git commits, logs, or Github-related issues).
+But if, after a crash, you actively send us information about your device, we'll use it for nothing more than locating and resolving your crash (which may appear in Git commits, logs, or GitHub-related issues).
 
 <h3> 4. How we protect your personal information</h3>
 We don't actively collect information at all. And no personal information about you to worry about. We don't want, need or want to help you protect it.
diff --git a/PrivacyPolicy_zh-CN.md b/PrivacyPolicy_zh-CN.md
@@ -13,7 +13,7 @@
 
 <h3> 三、我们如何共享、转让、公开披露你的个人信息</h3>
 我们压根就不主动收集信息。更没有你的个人信息，你不用担心。
-但是如果因为崩溃后，你主动发送了设备相关信息给我们，我们将用之定位和解决你的崩溃问题，而不作他用（可能会出现在 Git 的提交、log 或 Github 相关 issue 中）。
+但是如果因为崩溃后，你主动发送了设备相关信息给我们，我们将用之定位和解决你的崩溃问题，而不作他用（可能会出现在 Git 的提交、log 或 GitHub 相关 issue 中）。
 
 <h3> 四、我们如何保护你的个人信息</h3>
 我们压根就不主动收集信息。更没有你的个人信息，你不用担心。我们不要、不需要也没必要去帮你保护。
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Securely, easily add a watermark to your sensitive photos.</br>To prevent them f
 ## Download
 
 Developer-led download channels:
-- [Github Release](https://github.com/rosuH/EasyWatermark/releases): Always stay up to date!
+- [GitHub Release](https://github.com/rosuH/EasyWatermark/releases): Always stay up to date!
 - [Google Play](https://play.google.com/store/apps/details?id=me.rosuh.easywatermark)
   - 🍺 Noted: the paid version, the same code. Try it if you want to buy me a cup of tea 🍵.
 - [F-Droid](https://f-droid.org/packages/me.rosuh.easywatermark/)
diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -44,13 +44,13 @@
   - 当然也没有统计、埋点和 Device ID，甚至没有崩溃上报（所以如果遇到崩溃，麻烦和我们分享一下崩溃信息吧 >_<）。
   - 我们放弃方便的第三方采集 SDK 以及各种统计信息，就是为了让你能放心地使用。**你的就是你的。**
 - **布局**：支持水印间的横竖间隔，自动重复铺满整张图片。
-- **样式**：字体颜色、文本样式、透明度、大小和旋转角度都可以调节。
+- **样式**：字体颜色、文本样式、不透明度、大小和旋转角度都可以调节。
 - **内容**：支持文字水印和图片水印。
 
 ## 下载
 
 开发者所主导的下载渠道：
-- [Github Release](https://github.com/rosuH/EasyWatermark/releases)：永远保持最新
+- [GitHub Release](https://github.com/rosuH/EasyWatermark/releases)：永远保持最新
 - [Google Play](https://play.google.com/store/apps/details?id=me.rosuh.easywatermark)
     - 🍺 注意：收费版，但代码一致，如果您愿意请作者喝一杯茶（或者您比较任性），那么请去此下载，否则请选择其他渠道:)
 - [F-Droid](https://f-droid.org/packages/me.rosuh.easywatermark/)
@@ -66,7 +66,7 @@
 参考文案：
 > 本照片仅供 xx 作 xx 之用，他用无效。
 
-可以把透明度调低，不要挡住关键信息即可，一般审核都没问题。
+可以把不透明度调低，不要挡住关键信息即可，一般审核都没问题。
 
 > （目前）我们（暂时）无法阻止信息被上传，甚至（暂时）无法阻止信息被小人泄漏，但我们可以降低被泄漏信息的价值。
 >
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -32,7 +32,7 @@
     <string name="about_title_open_source">Quelloffen</string>
     <string name="about_title_author">Autor</string>
     <string name="about_title_designer">Designer</string>
-    <string name="about_title_repo_link">In Github öffnen</string>
+    <string name="about_title_repo_link">In GitHub öffnen</string>
     <string name="about_title_figma_link">Mehr Projekte</string>
     <string name="error_not_img">Bild auswählen</string>
     <string name="error_file_not_found">Bild konnte nicht geöffnet werden</string>
@@ -57,7 +57,7 @@
     <string name="tips_tip_title">Absturz erkannt</string>
     <string name="msg_crash">Absturz melden? Dies kann uns bei der Entwicklung helfen. Es werden hierbei keine persönlichen Daten gesammelt.</string>
     <string name="crash_mail">E-Mail senden</string>
-    <string name="tip_not_mail_found">Mail-Adresse wurde nicht erkannt. Alternativ kann die Fehlermeldung im App Store oder Github eingefügt werden.</string>
+    <string name="tip_not_mail_found">Mail-Adresse wurde nicht erkannt. Alternativ kann die Fehlermeldung im App Store oder GitHub eingefügt werden.</string>
     <string name="style_alpha">Alpha</string>
     <string name="dialog_change_log_title">Änderungen</string>
     <string name="tips_not_app_can_open_images">Kein Dateimanager erkannt.</string>
@@ -94,7 +94,7 @@
         </ol>
 ]]>
     </string>
-    <string name="dialog_check_out_in_github">Schau mal auf Github</string>
+    <string name="dialog_check_out_in_github">Schau mal auf GitHub</string>
     <string name="dialog_save_exporting">Export wird ausgeführt</string>
     <string name="dialog_save_export_list_title">Liste exportieren(%1$s)</string>
     <string name="dialog_open_in_gallery">In Galerie anzeigen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -32,7 +32,7 @@
     <string name="about_title_open_source">Código abierto</string>
     <string name="about_title_author">Autor</string>
     <string name="about_title_designer">Diseñador</string>
-    <string name="about_title_repo_link">Abrir en Github</string>
+    <string name="about_title_repo_link">Abrir en GitHub</string>
     <string name="about_title_figma_link">Más proyectos</string>
     <string name="error_not_img">Deberías elegir una foto</string>
     <string name="error_file_not_found">La foto quizás no existe</string>
@@ -57,7 +57,7 @@
     <string name="tips_tip_title">Se detectó trabas</string>
     <string name="msg_crash">¿Le gustaría ayudar a comentar la información errónea? ¡Esto puede ayudarnos a hacerlo mejor! Esto no recogerá su información personal.</string>
     <string name="crash_mail">Enviar correo</string>
-    <string name="tip_not_mail_found">Parece que no hay ningún cliente de correo instalado, puedes pegar activamente el mensaje en la tienda de aplicaciones o en Github</string>
+    <string name="tip_not_mail_found">Parece que no hay ningún cliente de correo instalado, puedes pegar activamente el mensaje en la tienda de aplicaciones o en GitHub</string>
     <string name="tips_content_size_performance">Cuanto más grande es el tamaño, más exigente es el rendimiento de la vista previa en tiempo real.</string>
     <string name="config_default_water_mark_text">👋Fotos son solo para propósitos de prueba.</string>
     <string name="style_alpha">Alfa</string>
@@ -94,7 +94,7 @@
     <string name="text_typeface_bold">Negrita</string>
     <string name="text_typeface_italic">Cursiva</string>
     <string name="text_typeface_bold_italic">Cursiva negrita</string>
-    <string name="dialog_check_out_in_github">Echa un vistazo a Github</string>
+    <string name="dialog_check_out_in_github">Echa un vistazo a GitHub</string>
     <string name="dialog_save_exporting">Exportando</string>
     <string name="dialog_save_export_list_title">Exportar lista(%1$s)</string>
     <string name="dialog_open_in_gallery">Ver en galería</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -34,7 +34,7 @@
     <string name="about_title_open_source">Licenze open source</string>
     <string name="about_title_author">Autore</string>
     <string name="about_title_designer">Designer</string>
-    <string name="about_title_repo_link">Apri su Github</string>
+    <string name="about_title_repo_link">Apri su GitHub</string>
     <string name="about_title_figma_link">Altri progetti</string>
     <string name="error_not_img">Seleziona un\'immagine</string>
     <string name="error_file_not_found">L\'immagine non può essere aperta o non è stata selezionata</string>
@@ -58,7 +58,7 @@
     <string name="tips_tip_title">Arresto anomalo rilevato</string>
     <string name="msg_crash">Vuoi segnalare questo arresto anomalo? Può aiutarci a migliorare l\'app! Ciò non raccoglierà alcuna informazione personale.</string>
     <string name="crash_mail">Invia email</string>
-    <string name="tip_not_mail_found">Nessun client di posta elettronica rilevato. In alternativa, puoi incollare il messaggio di errore nell\'app store o su Github.</string>
+    <string name="tip_not_mail_found">Nessun client di posta elettronica rilevato. In alternativa, puoi incollare il messaggio di errore nell\'app store o su GitHub.</string>
     <string name="tips_content_size_performance">Più grande è l\'immagine, più è difficile visualizzarla in tempo reale.</string>
     <string name="tips_content_mode_button">Clicca per modificare il testo o l\'immagine</string>
     <string name="config_default_water_mark_text">👋 NON RIDISTRIBUIRE</string>
@@ -82,7 +82,7 @@
     <string name="text_typeface_bold">Grassetto</string>
     <string name="text_typeface_italic">Corsivo</string>
     <string name="text_typeface_bold_italic">Grassetto Corsivo</string>
-    <string name="dialog_check_out_in_github">Dai un\'occhiata su Github</string>
+    <string name="dialog_check_out_in_github">Dai un\'occhiata su GitHub</string>
     <string name="dialog_save_export_list_title">Lista d\'esportazione (%1$s)</string>
     <string name="dialog_open_in_gallery">Visualizza nella galleria</string>
     <string name="dialog_save_config_format">Formato</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -44,11 +44,11 @@
     <string name="share">共有</string>
     <string name="water_mark_mode_text">テキスト</string>
     <string name="water_mark_mode_image">アイコン</string>
-    <string name="touch_alpha">透明度: %1$d</string>
+    <string name="touch_alpha">不透明度: %1$d</string>
     <string name="touch_size">サイズ: %1$d</string>
     <string name="hint_tips_input_water_mark_text">ウォーターマークのテキストを入力してください</string>
     <string name="tips_ok">確認</string>
-    <string name="hint_tips_alpha_100">透明度 100%</string>
+    <string name="hint_tips_alpha_100">不透明度 100%</string>
     <string name="tips_cancel_output">キャンセル</string>
     <string name="tips_need_compress_img">ストレージが不足しているか、画像が大きすぎます</string>
     <string name="tips_compressing">圧縮しています…</string>
@@ -62,7 +62,7 @@
     <string name="tips_content_size_performance">画像が大きくなればなるほど、リアルタイムで画像を見ることは難しくなります。</string>
     <string name="tips_content_mode_button">クリックすると、文字や画像を修正できます。</string>
     <string name="config_default_water_mark_text">👋 DO NOT REDISTRIBUTE</string>
-    <string name="style_alpha">透明度</string>
+    <string name="style_alpha">不透明度</string>
     <string name="contributor_info">問題についてのフィードバックが有効であるため修正された場合、または新しいバージョンがリリースされた場合、あなたの名前または電子メールがアップデートのポップアップウィンドウに表示されます。お客様の情報は非表示にしますので、フルネームは表示されません。\\n 表示させたくない場合は、"I do not want to."のマークを付けてください。</string>
     <string name="dialog_change_log_title">What\'s new</string>
     <string name="dialog_change_log_content">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -34,7 +34,7 @@
     <string name="about_title_open_source">Software livre</string>
     <string name="about_title_author">Autor</string>
     <string name="about_title_designer">Desenvolvedor</string>
-    <string name="about_title_repo_link">Visitar no Github</string>
+    <string name="about_title_repo_link">Visitar no GitHub</string>
     <string name="about_title_figma_link">Mais projetos</string>
     <string name="error_not_img">Selecione uma imagem</string>
     <string name="error_file_not_found">A imagem não pôde ser aberta ou não foi selecionada</string>
@@ -59,7 +59,7 @@
     <string name="tips_tip_title">Falha detectada</string>
     <string name="msg_crash">Gostaria de relatar este problema? Isto pode nos ajudar a melhorar o App e não coletará nenhuma informação pessoal.</string>
     <string name="crash_mail">Enviar um e-mail</string>
-    <string name="tip_not_mail_found">Nenhum cliente do e-mail detectado. Alternativamente, você pode colar a mensagem do erro na loja de aplicativos ou no Github.</string>
+    <string name="tip_not_mail_found">Nenhum cliente do e-mail detectado. Alternativamente, você pode colar a mensagem do erro na loja de aplicativos ou no GitHub.</string>
     <string name="tips_content_size_performance">Quanto maior for a imagem, mais recursos utilizará para ser visualizada em tempo real.</string>
     <string name="tips_content_mode_button">Clique para modificar texto ou imagem</string>
     <string name="config_default_water_mark_text">👋 NÃO REDISTRIBUIR</string>
@@ -94,7 +94,7 @@
     <string name="text_typeface_bold">Negrito</string>
     <string name="text_typeface_italic">Itálico</string>
     <string name="text_typeface_bold_italic">Negrito Itálico</string>
-    <string name="dialog_check_out_in_github">Confira no Github</string>
+    <string name="dialog_check_out_in_github">Confira no GitHub</string>
     <string name="dialog_save_exporting">Exportando</string>
     <string name="dialog_save_export_list_title">Exportar lista(%1$s)</string>
     <string name="dialog_open_in_gallery">Ver na Galeria</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -34,7 +34,7 @@
     <string name="about_title_open_source">开源许可</string>
     <string name="about_title_author">作者</string>
     <string name="about_title_designer">设计者</string>
-    <string name="about_title_repo_link">在 Github 上查看此项目</string>
+    <string name="about_title_repo_link">在 GitHub 上查看此项目</string>
     <string name="about_title_figma_link">查看他的更多作品</string>
     <!--UI-->
     <string name="error_not_img">请选择图片</string>
@@ -46,11 +46,11 @@
     <string name="share">分享</string>
     <string name="water_mark_mode_text">文字</string>
     <string name="water_mark_mode_image">贴纸</string>
-    <string name="touch_alpha">透明度: %1$d</string>
+    <string name="touch_alpha">不透明度: %1$d</string>
     <string name="touch_size">大小: %1$d</string>
     <string name="hint_tips_input_water_mark_text">请输入水印文字</string>
     <string name="tips_ok">确定</string>
-    <string name="hint_tips_alpha_100">透明度100%</string>
+    <string name="hint_tips_alpha_100">不透明度100%</string>
     <string name="tips_cancel_output">取消</string>
     <string name="tips_need_compress_img">图片过大或内存不足</string>
     <string name="tips_compressing">正在压缩中…</string>
@@ -60,11 +60,11 @@
     <string name="tips_tip_title">检测到崩溃</string>
     <string name="msg_crash">你愿意帮忙反馈错误信息吗？这样可以帮我们做得更好！这不会收集你的个人信息。</string>
     <string name="crash_mail">发送邮件</string>
-    <string name="tip_not_mail_found">似乎没有安装邮件客户端，你可以主动粘贴错误信息到应用市场或 Github</string>
+    <string name="tip_not_mail_found">似乎没有安装邮件客户端，你可以主动粘贴错误信息到应用市场或 GitHub</string>
     <string name="tips_content_size_performance">尺寸越大，实时预览性能要求越高</string>
     <string name="tips_content_mode_button">点击可修改文字或图片</string>
     <string name="config_default_water_mark_text">👋图片仅供测试，请勿作其他用途</string>
-    <string name="style_alpha">透明度</string>
+    <string name="style_alpha">不透明度</string>
     <string name="dialog_change_log_title">更新日志</string>
     <string name="contributor_info">当反馈的问题有效，并被修复或加入新版本时，您的名字或邮件出现在更新日志弹窗中。我们会对您的信息作遮挡处理，不会出现全称。\n 如果您不愿意出现，请标注：我不愿意。即可</string>
     <string name="dialog_change_log_content">
@@ -98,7 +98,7 @@
     <string name="text_typeface_bold">粗体</string>
     <string name="text_typeface_italic">斜体</string>
     <string name="text_typeface_bold_italic">斜体加粗</string>
-    <string name="dialog_check_out_in_github">在 Github 上查看</string>
+    <string name="dialog_check_out_in_github">在 GitHub 上查看</string>
     <string name="dialog_save_exporting">正在导出</string>
     <string name="dialog_save_export_list_title">导出列表（%1$s）</string>
     <string name="dialog_open_in_gallery">在相册中查看</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/fastlane/metadata/android/ja/full_description.txt b/fastlane/metadata/android/ja/full_description.txt
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
