Merge branch 'master' into soujuurou

app/src/main/res/values-b+zh+CN/localized.xml

@@ -92,7 +92,6 @@ Order Change"</string>
     <string name="p_battle_config_party">"队伍编号"</string>
     <string name="p_battle_config_server">"区服"</string>
     <string name="p_battle_config_card_priority">"指令卡优先级"</string>
-    <string name="p_battle_config_use_servant_priority">"使用从者优先级"</string>
     <string name="p_battle_config_support">"助战从者"</string>
     <string name="p_battle_config_support_selection_mode">"助战从者选取方式"</string>
     <string name="p_battle_config_support_fallback_selection_mode">"备用选取方式"</string>
@@ -173,6 +172,8 @@ Order Change"</string>
     <string name="card_priority">"指令卡优先级"</string>
     <string name="p_refill_type_gold">"黄金果实"</string>
     <string name="p_refill_type_silver">"白银果实"</string>
+
+    <!-- Fuzzy -->
     <string name="p_refill_type_bronze">"青铜果实"</string>
     <string name="p_refill_type_copper">"赤铜果实"</string>
     <string name="p_refill_type_sq">"圣晶石"</string>
@@ -209,6 +210,8 @@ Order Change"</string>
     <string name="p_support_class_berserker">"Berserker"</string>
     <string name="p_support_class_extra">"Extra"</string>
     <string name="p_support_class_mix">"混合职介（Mix）"</string>
+
+    <!-- Fuzzy -->
     <string name="overlay_notification_text">"服务启动中"</string>
     <string name="notification_stop">"停止"</string>
     <string name="accessibility_service">"无障碍服务："</string>
@@ -253,8 +256,12 @@ Order Change"</string>
     <string name="times_withdrew">"已撤退 %d 次"</string>
     <string name="avg_time_per_run">"平均一场时间：%s"</string>
     <string name="turns_count">"回合 %d"</string>
+
+    <!-- Fuzzy -->
     <string name="turns_stats">"回合: %1$d（最少）, %2$.02f（平均）, %3$d（最多）"</string>
-    <string name="picked_exp_stacks">"已挑选 %1$d 堆种火，共挑选 %2$d 枚种火"</string>
+
+    <!-- Fuzzy -->
+    <string name="picked_exp_stacks">"已挑选 %d 堆种火，共挑选 %d 枚种火"</string>
     <string name="no_embers_found">"无法在屏幕上找到种火，请确保经验卡的筛选已打开"</string>
     <string name="root_failed">"Root权限获取失败"</string>
     <string name="p_mats">"追踪掉落素材"</string>
@@ -317,8 +324,6 @@ Order Change"</string>
     <string name="mat_vestige_of_madness">"疯狂的残渣（暂译）"</string>
     <string name="mat_sunscale">"太阳皮（暂译）"</string>
     <string name="mat_converger">"以太蓄光体（暂译）"</string>
-    <string name="mat_flower_of_the_end">"终之花"</string>
-    <string name="mat_golden_cauldron">"黄金釜"</string>
     <string name="mat_monument_saber">"剑阶金像"</string>
     <string name="mat_monument_archer">"弓阶金像"</string>
     <string name="mat_monument_lancer">"枪阶金像"</string>
@@ -384,4 +389,35 @@ Order Change"</string>
     <string name="p_max_gold_ember_total_count">"金种火最大领取数（枚数）"</string>
     <string name="update_download_success">"下载成功。5秒后将重启APP。"</string>
     <string name="skill_maker_melusine">"妖兰/梅柳齐娜"</string>
+    <string name="p_battle_config_use_servant_priority">"使用从者优先级"</string>
+    <string name="reset_all">"全部重置"</string>
+    <string name="reset_to_default">"重置为默认值"</string>
+    <string name="p_choose_app_language">"选择语言"</string>
+    <string name="p_app_language">"语言"</string>
+    <string name="p_treat_support_like_own_servant">"助战从者视为自有从者"</string>
+    <string name="p_treat_support_like_own_servant_summary">"从者头像检查时将不再匹配助战图标。该功能可解决助战从者带有过多buff时引发的识别问题。但当队伍中有两名相同从者时，该功能可能会破坏指令卡优先级的设定。"</string>
+    <string name="skill_maker_main_delete_selected">"删除所选"</string>
+    <string name="skill_maker_main_wave">"第 %d 波"</string>
+    <string name="skill_maker_main_turn">"第 %d 回合"</string>
+    <string name="p_screenshot_bond"></string>
+    <string name="p_screenshot_bond_summary"></string>
+    <string name="bond_level_up"></string>
+    <string name="servant_enhancement">"从者强化"</string>
+    <string name="servant_enhancement_no_embers_or_qp_left"></string>
+    <string name="servert_enhancement_warning_notice">"该脚本将使用自动选择功能来选择种火。"</string>
+    <string name="servant_enhancement_redirect_ascension_question"></string>
+    <string name="servant_enhancement_perform_ascension_question"></string>
+    <string name="servant_enhancement_perform_ascension_warning"></string>
+    <string name="servant_enhancement_redirect_grail"></string>
+    <string name="servant_enhancement_redirect_ascension_success"></string>
+    <string name="servant_enhancement_redirect_grail_success"></string>
+    <string name="servant_enhancement_perform_ascension_failed"></string>
+    <string name="servant_enhancement_max_level"></string>
+    <string name="servant_enhancement_none_selected"></string>
+    <string name="servant_enhancement_aborted"></string>
+    <string name="note"></string>
+    <string name="p_hide_sq_in_resource"></string>
+    <string name="p_hide_sq_in_resource_summary"></string>
+    <string name="mat_flower_of_the_end">"终之花"</string>
+    <string name="mat_golden_cauldron">"黄金釜"</string>
 </resources>