From 252fa1ee4a8b36b54cb4fd7dd57061a847ace45c Mon Sep 17 00:00:00 2001
From: 92 <169070113+I21b@users.noreply.github.com>
Date: Sun, 20 Oct 2024 08:01:37 +0900
Subject: [PATCH 1/2] Update issue templates to yaml version

---
 .github/ISSUE_TEMPLATE/bug_report.md        | 30 -------
 .github/ISSUE_TEMPLATE/bug_report.yaml      | 95 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml           | 11 +++
 .github/ISSUE_TEMPLATE/feature_request.md   | 20 -----
 .github/ISSUE_TEMPLATE/feature_request.yaml | 50 +++++++++++
 5 files changed, 156 insertions(+), 50 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index fabeac0c..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: bug
-assignees: ''
-
----
-
-** Before making an issue make sure you are using the latest version of yt-dlp in the settings. Perhaps try using the nightly version of yt-dlp. If that didn't help, proceed with the issue
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots / Video Recording**
-If applicable, add them to help explain your problem.
-
-**(please complete the following information):**
- - Android Version: 
- - App Version:
- - Other Device Information:
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000..70f93493
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,95 @@
+name: Bug report
+description: Create a report to help us address issues you are facing
+title: "[Bug] "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        You can try the nightly version first. If that doesn't help, proceed with the issue.
+
+  - type: checkboxes
+    id: version
+    attributes:
+      label: ⠀
+      options:
+        - label: Tried latest version
+          required: true
+
+  - type: checkboxes
+    id: duplication
+    attributes:
+      label: ⠀
+      options:
+        - label: This issue is not duplicated with any other open or closed issues
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to make us better!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is
+      placeholder: |
+        App crashes on startup every time after changing settings.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+      placeholder: |
+        App started normally, everything is working fine.
+    validations:
+      required: false
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the bug
+      placeholder: |
+        1. Turn on "Don't download as Fragments" in "Folders" settings
+        2. Restart the app
+        3. Crash
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Device information
+      description: Provide details about your system environment
+      placeholder: |
+        Device:
+        System:
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots / Recordings
+      description: If applicable, add them to help explain your problem
+      placeholder: |
+        modified_setting_items.jpg
+        crashed_screen.jpg
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here
+      placeholder: |
+        Crash report:
+        Verbose logs:
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..586d7897
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GitHub discussions
+    url: https://github.com/deniscerri/ytdlnis/discussions
+    about: Discuss or ask questions here
+  - name: Telegram group
+    url: https://t.me/ytdlnis
+    about: You can also chat or ask questions here
+  - name: Discord server
+    url: https://discord.gg/WW3KYWxAPm
+    about: You can also chat or ask questions here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b923785e..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE REQUEST]"
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request available in yt-dlp? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000..145dc775
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,50 @@
+name: Feature request
+description: Suggest features you want to add or suggest to modify existing features
+title: "[Feature] "
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to make us better!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature
+      description: A clear and concise description of what the feature is
+      placeholder: |
+        A Quick Settings tile to quick download from the clipboard, long press to open the download panel.
+    validations:
+      required: true
+
+  - type: textarea
+    id: reasons
+    attributes:
+      label: Reason for adding
+      description: Explain why this feature would be useful to you
+      placeholder: |
+        For devices that don't have the copy popup, quickly download the video/audio from the Quick Settings tile and save lots of time.
+    validations:
+      required: true
+
+  - type: textarea
+    id: examples
+    attributes:
+      label: Example(s)
+      description: Post screenshots/drawings/links/etc of the feature request, or proof-of-concept images about the feature
+      placeholder: |
+        anywhere_toggle.jpg
+        quicktiles_toggle.jpg
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context about the feature here
+      placeholder: |
+        Existing solutions (code or repositories)
+    validations:
+      required: false

From 5f74bd75a222096a215669e9745ae138375342f3 Mon Sep 17 00:00:00 2001
From: 92 <169070113+I21b@users.noreply.github.com>
Date: Sun, 20 Oct 2024 08:21:48 +0900
Subject: [PATCH 2/2] Chinese translate small change

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

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0da82698..57c1e633 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,7 +21,7 @@
     <string name="audio_quality">音频质量</string>
     <string name="audio_quality_summary">0（最佳） 10（最差）</string>
     <string name="command_download_notification_channel_name">命令下载</string>
-    <string name="remove_downloading">取消正下载项</string>
+    <string name="remove_downloading">取消正在下载的任务</string>
     <string name="author">作者</string>
     <string name="download">下载</string>
     <string name="video_quality">视频质量</string>
@@ -58,7 +58,7 @@
     <string name="Open_File">打开文件</string>
     <string name="orange">橙色</string>
     <string name="remove_audio">移除音频</string>
-    <string name="download_already_exists">下载已存在</string>
+    <string name="download_already_exists">任务已存在</string>
     <string name="resume">继续</string>
     <string name="updating_download_data">更新下载项数据</string>
     <string name="socks5_proxy_summary">使用指定的 HTTP/HTTPS/SOCKS 代理</string>
@@ -71,9 +71,9 @@
     <string name="crop_thumb_summary">将缩略图裁剪成正方形以供音频下载</string>
     <string name="audio_only_item">此项仅包含音频格式</string>
     <string name="custom_audio_quality">自定义音频质量</string>
-    <string name="fragment_retries">片段重试次数</string>
+    <string name="fragment_retries">每段重试次数</string>
     <string name="force_keyframes_summary">过程较慢，但剪辑更准确</string>
-    <string name="use_extra_commands_summary">用于音频/视频下载。添加额外的命令以及 GUI 配置</string>
+    <string name="use_extra_commands_summary">用于音频/视频下载（添加额外的命令以及 GUI 配置）</string>
     <string name="use_extra_commands">添加额外命令</string>
     <string name="current">当前命令</string>
     <string name="subtitle_format">字幕格式</string>
@@ -102,7 +102,7 @@
     <string name="link_copied_to_clipboard">链接已复制到剪贴板</string>
     <string name="api_key">使用 API 密钥</string>
     <string name="api_key_summary">使用 Youtube API 获取视频推荐</string>
-    <string name="update_app_summary">打开应用时通知新版本。数据从官方 GitHub 仓库提取</string>
+    <string name="update_app_summary">打开应用时通知新版本（数据从官方 GitHub 仓库提取）</string>
     <string name="url">URL</string>
     <string name="show_download_card">显示下载卡片</string>
     <string name="exit_app">退出应用</string>
@@ -116,7 +116,7 @@
     <string name="edit">编辑</string>
     <string name="shortcuts_desc">使用常用命令创建模板</string>
     <string name="cancelled">已取消</string>
-    <string name="confirm_delete_logs_desc">永久删除全部日志列表。</string>
+    <string name="confirm_delete_logs_desc">永久删除全部日志列表</string>
     <string name="preferred_download_type_summary">下载卡片默认开启的类型</string>
     <string name="restart">重新开始</string>
     <string name="metered_network_download_start_info">一旦您连接到不按流量计费的网络，下载就会开始</string>
@@ -222,11 +222,11 @@
     <string name="confirm_terminate">停止所有下载并强制关闭应用</string>
     <string name="new_cut">新剪辑</string>
     <string name="new_cookie">新 Cookie</string>
-    <string name="downloads_running_try_later">下载器正在运行。稍后再试</string>
+    <string name="downloads_running_try_later">下载器正在运行，请稍后再试</string>
     <string name="freespace">可用空间</string>
     <string name="update_formats_summary">下载卡片一出现就获取格式</string>
     <string name="add_template_first">您至少需要创建一个命令模板！</string>
-    <string name="download_over_metered_networks_summary">使用任何网络类型下载。否则等待不按流量计费的网络</string>
+    <string name="download_over_metered_networks_summary">不等待，使用任何网络下载</string>
     <string name="suggested">建议</string>
     <string name="share">分享</string>
     <string name="video_recommendations_summary">从 NewPipe 提取器在主屏幕上获得推荐的 YouTube 视频</string>
@@ -256,7 +256,7 @@
     <string name="keep_cache">保留分段</string>
     <string name="keep_cache_summary">下载完成后不删除临时文件</string>
     <string name="backup">备份</string>
-    <string name="restore_complete">应用还原完成。以下项目已恢复：</string>
+    <string name="restore_complete">应用还原完成，以下项目已恢复：</string>
     <string name="select_backup_categories">选择备份类别</string>
     <string name="preferred_search_engine_summary">用于应用内搜索的搜索引擎</string>
     <string name="restore">恢复</string>
@@ -294,10 +294,10 @@
     <string name="auto_update_ytdlp">自动更新 yt-dlp</string>
     <string name="use_sponsorblock">使用 SponsorBlock</string>
     <string name="scheduling">定时任务</string>
-    <string name="cache_first_summary">先将缓存文件下载到内部存储，然后移动到您选择的目录。当您无法直接写入存储时使用此选项</string>
-    <string name="cache_first">先缓存下载</string>
+    <string name="cache_first_summary">先将下载文件缓存到内部存储，然后移动到您选择的目录（当您无法直接写入存储时使用此选项）</string>
+    <string name="cache_first">移动下载缓存</string>
     <string name="use_scheduler">按计划下载</string>
-    <string name="update_app_beta_summary">加入测试版计划。可能会遇到错误。</string>
+    <string name="update_app_beta_summary">加入测试计划，可能会遇到错误</string>
     <string name="update_app_beta">测试版本</string>
     <string name="auto">自动</string>
     <string name="preferred_audio_codec">首选音频编解码器</string>
@@ -357,7 +357,7 @@
     <string name="not_deleted">未删除</string>
     <string name="bitrate">比特率</string>
     <string name="save_auto_subs">保存自动字幕</string>
-    <string name="archive">下载存档 [使用 yt-dlp 的下载存档文件而非应用的内置功能来防止重复下载]</string>
+    <string name="archive">下载存档（使用 yt-dlp 的下载存档文件而非应用的内置功能来防止重复下载）</string>
     <string name="also_download_audio">同样下载为音频</string>
     <string name="wrap_text">换行显示过长文本</string>
     <string name="text_size">文本尺寸</string>
@@ -371,11 +371,11 @@
     <string name="get_new_uploads">只获取新上传</string>
     <string name="scroll_down">滚动到底部</string>
     <string name="add">添加</string>
-    <string name="no_download_fragments">不要下载为分段</string>
+    <string name="no_download_fragments">不要分段下载</string>
     <string name="no_download_fragments_summary">不使用 .part 文件并直接写入至输出文件</string>
     <string name="my_filename_templates">我的文件名模板</string>
     <string name="prefer_smaller_formats">偏好文件尺寸更小的格式</string>
-    <string name="display_over_apps_summary">使下载卡片时钟显示在顶部。如果在下载卡片出现时当前正在运行的应用关闭，请打开此选项</string>
+    <string name="display_over_apps_summary">使下载卡片时钟显示在顶部（如果在下载卡片出现时当前正在运行的应用关闭，请打开此选项）</string>
     <string name="display_over_apps">展示在其他应用上方</string>
     <string name="hour">小时</string>
     <string name="disabled">已停用</string>
@@ -389,13 +389,13 @@
     <string name="subtitles">字幕</string>
     <string name="move_bottom">移到底部</string>
     <string name="milliseconds">毫秒</string>
-    <string name="format_importance">格式重要性顺序</string>
-    <string name="format_importance_note">调整格式元素重要性。此顺序仅当应用在下载卡片中获取格式并自动选择格式时才会用到！</string>
+    <string name="format_importance">格式优先级</string>
+    <string name="format_importance_note">调整格式优先（仅用在下载卡片中获取格式并自动选择格式时)</string>
     <string name="no_audio">没有声音的视频</string>
     <string name="download_archive_folder">下载档案文件夹</string>
     <string name="location">位置</string>
-    <string name="enable_alarm_permission">你需要在应用设置中启用 SCHEDULE_EXACT_ALARM 权限。</string>
-    <string name="process_downloads_background">"仍在加载下载。继续在后台处理它们并开始下载吗？ "</string>
+    <string name="enable_alarm_permission">你需要在应用设置中启用 SCHEDULE_EXACT_ALARM 权限</string>
+    <string name="process_downloads_background">"继续在后台加载它们并开始下载吗？ "</string>
     <string name="minute">分钟</string>
     <string name="second">秒</string>
     <string name="sync_with_source">和源同步</string>
@@ -404,10 +404,9 @@
     <string name="always">始终</string>
     <string name="queue">队列</string>
     <string name="reset">重置</string>
-    <string name="restore_info">按下 “恢复” 将保存的数据和当前数据合并。
-\n按下“重置”擦除并只使用文件内保存的数据。</string>
+    <string name="restore_info">按下 “恢复” 将保存的数据和当前数据合并\n按下“重置”擦除并只使用文件内保存的数据</string>
     <string name="use_alarm_manager">使用闹铃管理器而非工作管理器安排任务</string>
-    <string name="use_alarm_manager_summary">如果工作管理器被设备厂商限制或安排好时间的任务不太精确，请启用这个</string>
+    <string name="use_alarm_manager_summary">如果工作管理器被限制或安排时间不精确，请启用这个</string>
     <string name="use_item_url_not_playlist">使用项目 URL 而非播放列表 URL</string>
     <string name="use_item_url_not_playlist_summary">启用此选项后不会内嵌播放列表元数据</string>
     <string name="recode_video_summary">重编码视频文件到指定的视频格式</string>
@@ -420,4 +419,4 @@
     <string name="playlist_as_album">将播放列表名用作专辑元数据</string>
     <string name="playlist_as_album_summary">如果专辑元数据不存在，使用播放列表名</string>
     <string name="data_fetching_extractor_youtube">数据获取提取工具（YouTube）</string>
-</resources>
\ No newline at end of file
+</resources>