adapt strings

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java

@@ -325,7 +325,7 @@ public class ServiceDuelAssistant extends Service {
     private void saveDeck(String deckMessage, boolean isUrl) {
         tv_message.setText(R.string.find_deck_text);
         bt_close.setText(R.string.search_close);
-        bt_join.setText("保存并打开");
+        bt_join.setText(R.string.save_n_open);
         disJoinDialog();
         showJoinDialog();
         new Handler().postDelayed(() -> {
@@ -346,7 +346,7 @@ public class ServiceDuelAssistant extends Service {
                 disJoinDialog();
                 //如果是卡组url
                 if (isUrl) {
-                    Deck deckInfo = new Deck("助手保存：" + System.currentTimeMillis(), Uri.parse(deckMessage));
+                    Deck deckInfo = new Deck(getString(R.string.rename_deck) + System.currentTimeMillis(), Uri.parse(deckMessage));
                     File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir());
                     Intent startdeck = new Intent(ServiceDuelAssistant.this, DeckManagerActivity.getDeckManager());
                     startdeck.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
@@ -356,7 +356,7 @@ public class ServiceDuelAssistant extends Service {
                     //如果是卡组文本
                     try {
                         //以当前时间戳作为卡组名保存卡组
-                        File file = DeckUtils.save("助手保存：" + System.currentTimeMillis(), deckMessage);
+                        File file = DeckUtils.save(getString(R.string.rename_deck) + System.currentTimeMillis(), deckMessage);
                         Intent startdeck = new Intent(ServiceDuelAssistant.this, DeckManagerActivity.getDeckManager());
                         startdeck.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
                         startdeck.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

mobile/src/main/res/layout/notification_view_duel_assistant.xml

@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="@string/About_DuelAssistant"
+            android:text="@string/about_DuelAssistant"
             android:textColor="@color/black"
             android:textSize="10sp" />
     </LinearLayout>

mobile/src/main/res/values-ko/strings.xml

@@ -237,7 +237,6 @@
     <string name="Checking_Update_Failed">업데이트 확인 실패</string>
     <string name="Ask_to_Change_Other_Way">\, 다른 방법으로 변경을 원하십니까</string>
     <string name="DuelAssistant">빠른 방 입장 기능이 사용중 입니다.</string>
-    <string name="About_DuelAssistant">코드 번호를 복사할 경우 빠른 방 입장 기능을 사용이 가능합니다.</string>
     <string name="masterrule">마스터즈 룰</string>
     <string name="tutorial">가이드 북 보기</string>
     <string name="about_help">원하는 내용을 클릭합니다.</string>
@@ -246,11 +245,11 @@
     <string name="invalid_shortcut">잘못된 바로 가기</string>
     <string name="return_to_duel">게임으로 돌아가다☞</string>
     <string name="Start_ServiceDuelAssistant">결투 보조원</string>
-    <string name="about_DuelAssistant">다음 기능을 사용하도록 권한 설정이 필요합니다.
-        \n게임 코드를 통한 방 입장
+    <string name="about_DuelAssistant">게임 코드를 통한 방 입장
         \n“？”을 이용한 카드 검색
         \n덱 코드를 이용한 덱공유</string>
     <string name="find_deck_text">덱 공유 코드가 감지 되었습니다. 덱을 저장하겠습니까？</string>
     <string name="save_failed_bcos">다음 이유로 인해 저장에 실패했습니다:</string>
     <string name="deck_text_copyed">덱 공유 코드를 클립보드에 복사했습니다</string>
+    <string name="save_n_open">저장후 열기</string>
 </resources>

mobile/src/main/res/values-zh/strings.xml

@@ -236,7 +236,6 @@
     <string name="Checking_Update_Failed">检查更新失败</string>
     <string name="Ask_to_Change_Other_Way">，是否跳转到备用下载方式？</string>
     <string name="DuelAssistant">决斗助手启用中</string>
-    <string name="About_DuelAssistant">用于快速查卡与约战加房的服务</string>
     <string name="masterrule">学习大师规则</string>
     <string name="tutorial">查看软件教程</string>
     <string name="about_help">点击您想要了解的内容</string>
@@ -245,11 +244,11 @@
     <string name="invalid_shortcut">无效的快捷方式</string>
     <string name="return_to_duel">返回决斗☞</string>
     <string name="Start_ServiceDuelAssistant">开启决斗助手</string>
-    <string name="about_DuelAssistant">开启以使用以下功能
-        \n复制约战房间号直接加房
+    <string name="about_DuelAssistant">复制约战房间号直接加房
         \n复制“？”+关键词直接查询卡片
         \n复制卡组文本直接保存为卡组并在卡组编辑打开它</string>
     <string name="find_deck_text">检测到卡组文本，是否保存？</string>
     <string name="save_failed_bcos">保存失败，原因为</string>
     <string name="deck_text_copyed">已复制卡组文本到剪贴板</string>
+    <string name="save_n_open">保存并打开</string>
 </resources>

mobile/src/main/res/values/strings.xml

@@ -236,7 +236,6 @@
     <string name="Checking_Update_Failed">Checking Update Failed</string>
     <string name="Ask_to_Change_Other_Way">\, would you like to change other way</string>
     <string name="DuelAssistant">DuelAssiatant is On</string>
-    <string name="About_DuelAssistant">Service for getting Keywords from Clipboard</string>
     <string name="masterrule">Master Rule</string>
     <string name="tutorial">Soft Tutorial</string>
     <string name="about_help">Click button which you want to know</string>
@@ -245,11 +244,11 @@
     <string name="invalid_shortcut">Invalid Shortcut</string>
     <string name="return_to_duel">Return to Duel☞</string>
     <string name="Start_ServiceDuelAssistant">DuelAssistant</string>
-    <string name="about_DuelAssistant">Turn on to use Functions as follow
-        \nCopy PSW to Quick Join Game.
+    <string name="about_DuelAssistant">Copy PSW to Quick Join Game.
         \nCopy Keywords to Search Cards.
         \nCopy Deck Text to Save as YDK and Open in Deck Editor</string>
     <string name="find_deck_text">Find your copyed Deck Text, Save or Not?</string>
     <string name="save_failed_bcos">save failed bcos of</string>
     <string name="deck_text_copyed">Deck Text copyed</string>
+    <string name="save_n_open">Save and Open</string>
 </resources>

mobile/src/main/res/xml/preference_game.xml

@@ -30,15 +30,15 @@
             android:persistent="true"
             android:summary="@string/only_game_tip"
             android:title="@string/settings_pref_settings_only_game"/-->
-        <CheckBoxPreference
-            android:key="pref_settings_read_ex"
-            android:persistent="true"
-            android:title="@string/title_use_ex"/>
         <CheckBoxPreference
             android:key="pref_key_start_serviceduelassistant"
             android:persistent="true"
-            android:summary="@string/About_DuelAssistant"
+            android:summary="@string/about_DuelAssistant"
             android:title="@string/Start_ServiceDuelAssistant"/>
+        <CheckBoxPreference
+            android:key="pref_settings_read_ex"
+            android:persistent="true"
+            android:title="@string/title_use_ex"/>
         <CheckBoxPreference
             android:key="pref_key_game_sound_effect"
             android:persistent="true"