From b134fca045cab7a7aa026d7ec87de0efd50c8c30 Mon Sep 17 00:00:00 2001
From: dss886 <dss886@gmail.com>
Date: Mon, 3 Jul 2017 19:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=8F=91=E5=B8=831.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                       |  4 ++--
 app/src/main/res/values-zh/strings.xml | 16 ----------------
 app/src/main/res/values/strings.xml    | 12 ++++++++++++
 3 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/res/values-zh/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 35aa824..0d491e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.dss886.transmis"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
deleted file mode 100644
index 9048b17..0000000
--- a/app/src/main/res/values-zh/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Transmis</string>
-    <string name="main_title">Transmis 设置</string>
-    <string name="sms_title">短信提醒</string>
-    <string name="call_title">未接电话提醒</string>
-    <string name="mail_title">邮件参数设置</string>
-
-    <string name="sms_title_default">你的备用机收到了一条新短信</string>
-    <string name="sms_content_default">电话：%1$s \n内容：%2$s \n\n</string>
-    <string name="call_title_default">你的备用机有一个未接电话</string>
-    <string name="call_content_default">电话：%1$s \n时间：%2$s \n响铃：%3$s 秒\n\n</string>
-
-    <string name="info_sms_content">模版中使用 "%s" 来表示号码和内容等变量</string>
-    <string name="info_call_content">模版中使用 "%s" 来表示号码、内容和响铃时间等变量</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07b770b..4f07a0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,15 @@
 <resources>
     <string name="app_name">Transmis</string>
+    <string name="main_title">Transmis 设置</string>
+    <string name="sms_title">短信提醒</string>
+    <string name="call_title">未接电话提醒</string>
+    <string name="mail_title">邮件参数设置</string>
+
+    <string name="sms_title_default">你的备用机收到了一条新短信</string>
+    <string name="sms_content_default">电话：%1$s \n内容：%2$s \n\n</string>
+    <string name="call_title_default">你的备用机有一个未接电话</string>
+    <string name="call_content_default">电话：%1$s \n时间：%2$s \n响铃：%3$s 秒\n\n</string>
+
+    <string name="info_sms_content">模版中使用 "%s" 来表示号码和内容等变量</string>
+    <string name="info_call_content">模版中使用 "%s" 来表示号码、内容和响铃时间等变量</string>
 </resources>