diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 644713b..d727858 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -91,7 +91,7 @@
         </activity>
         <activity
                 android:name=".ui.setting.SettingsActivity"
-                android:label="@string/title_activity_settings"
+                android:label="@string/settings"
                 android:parentActivityName=".ui.main.MainActivity"
                 android:theme="@style/AppTheme.ActionBar">
             <meta-data
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/Bangumi.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/Bangumi.kt
index d47a707..bbcd54f 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/Bangumi.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/Bangumi.kt
@@ -12,7 +12,6 @@ import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.*
 import soko.ekibun.bangumi.api.ApiHelper
 import soko.ekibun.bangumi.api.bangumi.bean.*
-import soko.ekibun.bangumi.api.bangumi.bean.Calendar
 import soko.ekibun.bangumi.api.bangumi.bean.Collection
 import soko.ekibun.bangumi.util.HttpUtil
 import java.net.URI
@@ -511,22 +510,24 @@ interface Bangumi {
         //userInfo
         fun getUserInfo(ua: String): Call<UserInfo>{
             val cookieManager = CookieManager.getInstance()
-            return ApiHelper.buildHttpCall(Bangumi.SERVER, mapOf("User-Agent" to ua)){
+            return ApiHelper.buildHttpCall("$SERVER/settings", mapOf("User-Agent" to ua)){
                 var needReload = false
                 val doc = Jsoup.parse(it.body()?.string()?:"")
                 val user = doc.selectFirst(".idBadgerNeue a.avatar")?: throw Exception("login failed")
-                val userName = doc.selectFirst("#header a")?.text()
+                val userName = doc.selectFirst("input[name=nickname]")?.attr("value")//doc.selectFirst("#header a")?.text()
                 val img = HttpUtil.getUrl(Regex("""background-image:url\('([^']*)'\)""").find(user.html()?:"")?.groupValues?.get(1)?:"", URI.create(Bangumi.SERVER))
                 val id = Regex("""/user/([^/]*)""").find(user.attr("href")?:"")?.groupValues?.get(1)
                 it.headers("set-cookie").forEach {
                     needReload = true
                     cookieManager.setCookie(Bangumi.SERVER, it) }
                 val formhash = doc.selectFirst("input[name=formhash]")?.attr("value")
+                val inbox = Regex("叮咚叮咚～你有 ([0-9]+) 条新信息!").find(doc.selectFirst("#robot_speech_js")?.text()?:"")?.groupValues?.get(1)?.toIntOrNull()?:0
+                val notify = doc.selectFirst("#notify_count")?.text()?.toIntOrNull()?:0
                 UserInfo(id?.toIntOrNull()?:0, HttpUtil.getUrl(user.attr("href")?:"", URI.create(SERVER)), id, userName,
                         Images(img.replace("/s/", "/l/"),
                                 img.replace("/s/", "/l/"),
                                 img.replace("/s/", "/m/"), img,
-                                img.replace("/s/", "/m/")), sign = formhash, needReload = needReload)
+                                img.replace("/s/", "/m/")), sign = formhash, needReload = needReload, notify = Pair(inbox, notify))
             }
         }
 
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/CollectionStatusType.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/CollectionStatusType.kt
index eb7639b..82ba24f 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/CollectionStatusType.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/CollectionStatusType.kt
@@ -1,6 +1,7 @@
 package soko.ekibun.bangumi.api.bangumi.bean
 
 import android.support.annotation.StringDef
+import soko.ekibun.bangumi.R
 
 object CollectionStatusType{
     const val WISH = "wish"
@@ -11,4 +12,14 @@ object CollectionStatusType{
     @StringDef(WISH, COLLECT, DO, ON_HOLD, DROPPED)
     annotation class CollectionStatusType
     val status=arrayOf(WISH, COLLECT, DO, ON_HOLD, DROPPED)
+
+    fun getTypeNamesResId(@SubjectType.SubjectType type: Int): Int{
+        return when(type){
+            SubjectType.BOOK -> R.array.collection_status_book
+            SubjectType.MUSIC -> R.array.collection_status_music
+            SubjectType.GAME -> R.array.collection_status_game
+            SubjectType.REAL -> R.array.collection_status_real
+            else -> R.array.collection_status_anime
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Episode.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Episode.kt
index 99c3171..650a1e2 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Episode.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Episode.kt
@@ -1,7 +1,9 @@
 package soko.ekibun.bangumi.api.bangumi.bean
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.support.annotation.IntDef
+import soko.ekibun.bangumi.R
 import java.text.DecimalFormat
 
 
@@ -37,11 +39,11 @@ data class Episode(
      * status : Air
      */
 
-    fun parseSort(): String{
+    fun parseSort(context: Context): String{
         return if(type == TYPE_MAIN)
-            "第 ${DecimalFormat("#.##").format(sort)} 话"
+            context.getString(R.string.parse_sort_ep, DecimalFormat("#.##").format(sort))
         else
-            getTypeName(type) + " ${DecimalFormat("#.##").format(sort)}"
+            context.getString(getTypeName(type)) + " ${DecimalFormat("#.##").format(sort)}"
     }
 
     companion object {
@@ -58,16 +60,16 @@ data class Episode(
         annotation class EpisodeType
 
         @SuppressLint("SwitchIntDef")
-        fun getTypeName(@EpisodeType type: Int): String{
+        fun getTypeName(@EpisodeType type: Int): Int{
             return when(type){
-                TYPE_MAIN -> "本篇"
-                TYPE_SP -> "特别篇"
-                TYPE_OP -> "OP"
-                TYPE_ED -> "ED"
-                TYPE_PV -> "PV"
-                TYPE_MAD -> "MAD"
-                TYPE_MUSIC -> "曲目"
-                else -> "其他"
+                TYPE_MAIN -> R.string.episode_type_main
+                TYPE_SP -> R.string.episode_type_sp
+                TYPE_OP -> R.string.episode_type_op
+                TYPE_ED -> R.string.episode_type_ed
+                TYPE_PV -> R.string.episode_type_pv
+                TYPE_MAD -> R.string.episode_type_mad
+                TYPE_MUSIC -> R.string.episode_type_music
+                else -> R.string.episode_type_main
             }
         }
     }
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Images.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Images.kt
index 4248f13..7489cc3 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Images.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/Images.kt
@@ -13,7 +13,13 @@ data class Images(
 
     fun getImage(context: Context): String? {
         val quality = PreferenceManager.getDefaultSharedPreferences(context).getString("image_quality", "c")
-        return common?.replace("/c/", "/$quality/")
+        return when(quality){
+            "l" -> large
+            "m" -> medium
+            "s" -> small
+            "g" -> grid
+            else -> common
+        }
     }
     /**
      * large : http://lain.bgm.tv/pic/cover/l/e5/ba/6776_bA2h2.jpg
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/SubjectType.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/SubjectType.kt
index 0a0f06f..cccb7c3 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/SubjectType.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/SubjectType.kt
@@ -3,6 +3,7 @@ package soko.ekibun.bangumi.api.bangumi.bean
 import android.annotation.SuppressLint
 import android.support.annotation.IntDef
 import android.support.annotation.StringDef
+import soko.ekibun.bangumi.R
 
 object SubjectType{
     const val ALL = 0
@@ -31,15 +32,14 @@ object SubjectType{
     )
 
     @SuppressLint("SwitchIntDef")
-    fun getDescription(@SubjectType type: Int): String{
+    fun getDescription(@SubjectType type: Int): Int{
         return when (type) {
-            ALL -> "条目"
-            BOOK -> "书籍"
-            ANIME -> "动画"
-            MUSIC -> "音乐"
-            GAME -> "游戏"
-            REAL -> "三次元"
-            else -> ""
+            BOOK -> R.string.book
+            ANIME -> R.string.anime
+            MUSIC -> R.string.music
+            GAME ->  R.string.game
+            REAL ->  R.string.real
+            else -> R.string.subject
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/UserInfo.kt b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/UserInfo.kt
index ce0160b..76b2a83 100644
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/UserInfo.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/UserInfo.kt
@@ -7,7 +7,8 @@ data class UserInfo(
         var nickname: String? = null,
         var avatar: Images? = null,
         var sign: String? = null, //formhash
-        var needReload: Boolean = false
+        var needReload: Boolean = false,
+        var notify: Pair<Int, Int>? = null
 ): BaseRequest(){
     /**
      * id : 419012
diff --git a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/gson.java b/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/gson.java
deleted file mode 100644
index 00338a1..0000000
--- a/app/src/main/java/soko/ekibun/bangumi/api/bangumi/bean/gson.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package soko.ekibun.bangumi.api.bangumi.bean;
-
-public class gson {
-
-    /**
-     * code : success
-     * data : {"width":1157,"height":680,"filename":"image_2015-08-26_10-54-48.png","storename":"56249afa4e48b.png","size":69525,"path":"/2015/10/19/56249afa4e48b.png","hash":"nLbCw63NheaiJp1","timestamp":1445239546,"url":"https://ooo.0o0.ooo/2015/10/19/56249afa4e48b.png","delete":"https://sm.ms/api/delete/nLbCw63NheaiJp1"}
-     */
-
-    private String code;
-    private DataBean data;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public DataBean getData() {
-        return data;
-    }
-
-    public void setData(DataBean data) {
-        this.data = data;
-    }
-
-    public static class DataBean {
-        /**
-         * width : 1157
-         * height : 680
-         * filename : image_2015-08-26_10-54-48.png
-         * storename : 56249afa4e48b.png
-         * size : 69525
-         * path : /2015/10/19/56249afa4e48b.png
-         * hash : nLbCw63NheaiJp1
-         * timestamp : 1445239546
-         * url : https://ooo.0o0.ooo/2015/10/19/56249afa4e48b.png
-         * delete : https://sm.ms/api/delete/nLbCw63NheaiJp1
-         */
-
-        private int width;
-        private int height;
-        private String filename;
-        private String storename;
-        private int size;
-        private String path;
-        private String hash;
-        private int timestamp;
-        private String url;
-        private String delete;
-
-        public int getWidth() {
-            return width;
-        }
-
-        public void setWidth(int width) {
-            this.width = width;
-        }
-
-        public int getHeight() {
-            return height;
-        }
-
-        public void setHeight(int height) {
-            this.height = height;
-        }
-
-        public String getFilename() {
-            return filename;
-        }
-
-        public void setFilename(String filename) {
-            this.filename = filename;
-        }
-
-        public String getStorename() {
-            return storename;
-        }
-
-        public void setStorename(String storename) {
-            this.storename = storename;
-        }
-
-        public int getSize() {
-            return size;
-        }
-
-        public void setSize(int size) {
-            this.size = size;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        public void setPath(String path) {
-            this.path = path;
-        }
-
-        public String getHash() {
-            return hash;
-        }
-
-        public void setHash(String hash) {
-            this.hash = hash;
-        }
-
-        public int getTimestamp() {
-            return timestamp;
-        }
-
-        public void setTimestamp(int timestamp) {
-            this.timestamp = timestamp;
-        }
-
-        public String getUrl() {
-            return url;
-        }
-
-        public void setUrl(String url) {
-            this.url = url;
-        }
-
-        public String getDelete() {
-            return delete;
-        }
-
-        public void setDelete(String delete) {
-            this.delete = delete;
-        }
-    }
-}
diff --git a/app/src/main/java/soko/ekibun/bangumi/model/SearchHistoryModel.kt b/app/src/main/java/soko/ekibun/bangumi/model/SearchHistoryModel.kt
new file mode 100644
index 0000000..b596d6a
--- /dev/null
+++ b/app/src/main/java/soko/ekibun/bangumi/model/SearchHistoryModel.kt
@@ -0,0 +1,36 @@
+package soko.ekibun.bangumi.model
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+import com.google.gson.reflect.TypeToken
+import soko.ekibun.bangumi.util.JsonUtil
+
+class SearchHistoryModel(context: Context){
+    val sp: SharedPreferences by lazy{ PreferenceManager.getDefaultSharedPreferences(context) }
+
+    fun addHistory(searchKey: String) {
+        val newList = getHistoryList().toMutableList()
+        newList.add(0, searchKey)
+        sp.edit().putString(PREF_SEARCH_HISTORY, JsonUtil.toJson(newList.distinct())).apply()
+    }
+
+    fun removeHistory(searchKey: String): Boolean {
+        val newList = getHistoryList().toMutableList()
+        val removed = newList.remove(searchKey)
+        sp.edit().putString(PREF_SEARCH_HISTORY, JsonUtil.toJson(newList)).apply()
+        return removed
+    }
+
+    fun clearHistory() {
+        sp.edit().putString(PREF_SEARCH_HISTORY, JsonUtil.toJson(ArrayList<String>())).apply()
+    }
+
+    fun getHistoryList(): List<String> {
+        return JsonUtil.toEntity(sp.getString(PREF_SEARCH_HISTORY, JsonUtil.toJson(ArrayList<String>()))!!, object: TypeToken<List<String>>() {}.type)?:ArrayList()
+    }
+
+    companion object {
+        const val PREF_SEARCH_HISTORY="searchHistory"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/crash/CrashActivity.kt b/app/src/main/java/soko/ekibun/bangumi/ui/crash/CrashActivity.kt
index 6f505eb..0514b6e 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/crash/CrashActivity.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/crash/CrashActivity.kt
@@ -28,7 +28,7 @@ class CrashActivity : AppCompatActivity() {
             uploadCall?.cancel()
             uploadCall = Xxxlin.createInstance().crashReport(content, AppUtil.getVersionCode(this), AppUtil.getVersionName(this))
             uploadCall?.enqueue(ApiHelper.buildCallback(this, {
-                        Snackbar.make(item_upload, if(it.code == 0) "日志上传成功" else "日志上传失败：${it.msg}", Snackbar.LENGTH_SHORT).show()
+                        Snackbar.make(item_upload, if(it.code == 0) getString(R.string.crash_upload_ok) else getString(R.string.crash_upload_failed, it.msg?:""), Snackbar.LENGTH_SHORT).show()
                         item_upload.setOnClickListener{}
                     }, {}))
         }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/MainActivity.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/MainActivity.kt
index 303eb63..a7b2054 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/MainActivity.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/MainActivity.kt
@@ -14,6 +14,7 @@ import soko.ekibun.bangumi.model.ThemeModel
 import soko.ekibun.bangumi.ui.search.SearchActivity
 import android.support.v4.view.MenuItemCompat
 import android.support.v7.app.AlertDialog
+import android.support.v7.widget.PopupMenu
 import android.view.KeyEvent
 import android.webkit.WebView
 import android.widget.Toast
@@ -38,32 +39,28 @@ class MainActivity : AppCompatActivity() {
         if(sp.getBoolean("check_update", true)){
             Github.createInstance().releases().enqueue(ApiHelper.buildCallback(this, {
                 val release = it.firstOrNull()?:return@buildCallback
-                if(release.tag_name?.compareTo(packageManager?.getPackageInfo(packageName, 0)?.versionName?:"")?:0 > 0 && sp.getString("ignore_tag", "") != release.tag_name)
+                val current = packageManager?.getPackageInfo(packageName, 0)?.versionName?:""
+                if(release.tag_name?.compareTo(current)?:0 > 0 && sp.getString("ignore_tag", "") != release.tag_name)
                     AlertDialog.Builder(this)
-                            .setTitle("新版本：${release.tag_name}")
-                            .setMessage(release.body)
-                            .setPositiveButton("下载"){_, _ ->
+                            .setTitle( getString(R.string.parse_new_version, release.tag_name))
+                            .setMessage( it.filter { it.tag_name?.compareTo(current)?:0 > 0 }.map { "${it.tag_name}\n${it.body}" }.reduce { acc, s -> "$acc\n$s" } )
+                            .setPositiveButton(R.string.download){_, _ ->
                                 WebActivity.launchUrl(this@MainActivity, release.assets?.firstOrNull()?.browser_download_url, "")
-                            }.setNegativeButton("忽略"){_, _ ->
+                            }.setNegativeButton(R.string.ignore){_, _ ->
                                 sp.edit().putString("ignore_tag", release.tag_name).apply()
                             }.show()
             }) {})
         }
-        mainPresenter.refreshUser{
-            mainPresenter.reload()
-            Bangumi.getNotify(ua).enqueue(ApiHelper.buildCallback(this, {
-                notifyMenu?.badge = it.count()
-            },{}))
-        }
+
     }
 
     val ua by lazy { WebView(this).settings.userAgentString }
     override fun onStart() {
         super.onStart()
 
-        Bangumi.getNotify(ua).enqueue(ApiHelper.buildCallback(this, {
-            notifyMenu?.badge = it.count()
-        },{}))
+        mainPresenter.refreshUser{
+            mainPresenter.reload()
+        }
     }
 
     var notifyMenu: NotifyActionProvider? = null
@@ -73,7 +70,20 @@ class MainActivity : AppCompatActivity() {
         val menuItem = menu.findItem(R.id.action_notify)
         notifyMenu = MenuItemCompat.getActionProvider(menuItem) as NotifyActionProvider
         notifyMenu?.onClick = {
-            WebActivity.launchUrl(this, "${Bangumi.SERVER}/notify")
+            val inbox = mainPresenter.user?.notify?.first?:0
+            val notify = mainPresenter.user?.notify?.second?:0
+            val popup = PopupMenu(this, menuItem.actionView)
+            popup.menuInflater.inflate(R.menu.list_notify, popup.menu)
+            popup.menu.findItem(R.id.notify_type_inbox)?.title = "${getString(R.string.notify_inbox)}${if(inbox != 0) " (+$inbox)" else ""}"
+            popup.menu.findItem(R.id.notify_type_notify)?.title = "${getString(R.string.notify_notify)}${if(notify != 0) " (+$notify)" else ""}"
+            popup.setOnMenuItemClickListener{
+                when(it.itemId){
+                    R.id.notify_type_inbox -> WebActivity.launchUrl(this, "${Bangumi.SERVER}/pm")
+                    R.id.notify_type_notify -> WebActivity.launchUrl(this, "${Bangumi.SERVER}/notify")
+                }
+                true
+            }
+            popup.show()
         }
 
         return true
@@ -85,7 +95,7 @@ class MainActivity : AppCompatActivity() {
             if(mainPresenter.processBack()){
                 return true
             }else if((System.currentTimeMillis()-exitTime) > 2000){
-                Toast.makeText(applicationContext, "再按一次退出程序", Toast.LENGTH_SHORT).show()
+                Toast.makeText(applicationContext, R.string.hint_back_to_close, Toast.LENGTH_SHORT).show()
                 exitTime = System.currentTimeMillis()
                 return true
             }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/MainPresenter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/MainPresenter.kt
index 184e41b..11f4a30 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/MainPresenter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/MainPresenter.kt
@@ -70,6 +70,7 @@ class MainPresenter(private val context: MainActivity){
     fun refreshUser(reload: ()->Unit = {}){
         Bangumi.getUserInfo(context.ua).enqueue(ApiHelper.buildCallback(null, {
             updateUser(it)
+            context.notifyMenu?.badge = it.notify?.let{ it.first + it.second}?:0
             if(it.needReload) reload()
         }, { if((it as? Exception)?.message == "login failed") updateUser(null) }))
     }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/UserView.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/UserView.kt
index dae1ef3..ad521fb 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/UserView.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/UserView.kt
@@ -25,7 +25,7 @@ class UserView(private val context: MainActivity, onUserFigureClickListener: Vie
                     .into(headerView.user_figure)
             //val token = UserModel(context).getToken()
             headerView.user_id.text = if(user?.username == null) "" else "@${user.username}"
-            headerView.user_name.text = user?.nickname?:context.getString(R.string.login_hint)
+            headerView.user_name.text = user?.nickname?:context.getString(R.string.hint_login)
         }
     }
 
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/cache/CacheAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/cache/CacheAdapter.kt
index b9e92aa..e08d3d6 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/cache/CacheAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/cache/CacheAdapter.kt
@@ -14,7 +14,7 @@ class CacheAdapter(data: MutableList<PlayerBridge.VideoCache>? = null) :
     override fun convert(helper: BaseViewHolder, item: PlayerBridge.VideoCache) {
         helper.setText(R.id.item_title, item.bangumi.getPrettyName())
         helper.setText(R.id.item_name_jp, item.bangumi.name)
-        helper.setText(R.id.item_summary, "已缓存 ${item.videoList.size} 话")
+        helper.setText(R.id.item_summary, helper.itemView.context.getString(R.string.parse_cache_eps, item.videoList.size))
         Glide.with(helper.itemView.item_cover)
                 .load(item.bangumi.images?.getImage(helper.itemView.context))
                 .apply(RequestOptions.errorOf(R.drawable.ic_404))
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/calendar/CalendarAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/calendar/CalendarAdapter.kt
index b62fb5a..e02d342 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/calendar/CalendarAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/calendar/CalendarAdapter.kt
@@ -22,7 +22,7 @@ class CalendarAdapter(data: MutableList<CalendarSection>? = null) :
     override fun convert(helper: BaseViewHolder, item: CalendarSection) {
         helper.addOnClickListener(R.id.item_layout)
         helper.setText(R.id.item_title, (if(item.t.subject.collect) " " else "")+item.t.subject.getPrettyName())
-        helper.setText(R.id.item_ep_name, item.t.episode?.parseSort() + " " + (if(item.t.episode?.name_cn.isNullOrEmpty()) item.t.episode?.name?:"" else item.t.episode?.name_cn))
+        helper.setText(R.id.item_ep_name, item.t.episode?.parseSort(helper.itemView.context) + " " + (if(item.t.episode?.name_cn.isNullOrEmpty()) item.t.episode?.name?:"" else item.t.episode?.name_cn))
         helper.addOnClickListener(R.id.item_layout)
         Glide.with(helper.itemView.item_cover)
                 .load(item.t.subject.images?.small)
@@ -74,6 +74,7 @@ class CalendarAdapter(data: MutableList<CalendarSection>? = null) :
     }
 
     companion object {
+        //TODO
         val weekJp = listOf("", "月", "火", "水", "木", "金", "土", "日")
         val weekSmall = listOf("", "周一", "周二", "周三", "周四", "周五", "周六", "周日")
 
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionFragment.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionFragment.kt
index da6f62b..9867e35 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionFragment.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionFragment.kt
@@ -21,7 +21,6 @@ class CollectionFragment: HomeTabFragment(R.layout.fragment_collection){
 
         item_pager?.currentItem = this.savedInstanceState?.getInt("CollectionPage", 2) ?: 2
 
-        //TODO item_login_info?.visibility = if((activity as? MainActivity)?.user == null) View.VISIBLE else View.GONE
         item_login?.setOnClickListener {
             WebActivity.startActivityForAuth(activity!!) }
     }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionListAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionListAdapter.kt
index 0c54cf5..788718c 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionListAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionListAdapter.kt
@@ -24,8 +24,12 @@ class CollectionListAdapter(data: MutableList<SubjectCollection>? = null) :
                 if (watchTo != airTo)R.attr.colorPrimary
                     else android.R.attr.textColorSecondary
                 ))
-        val watchep = (watchTo?.parseSort()?.let{ "看到$it"}?:"尚未观看") +
-                if(eps?.any { it.status != "Air" } == true) airTo?.parseSort()?.let{ " / 更新到$it"  }?:"" else if(item.subject?.eps_count?:0 > 0) " / 全 ${item.subject?.eps_count} 话" else ""
+        val watchep = (watchTo?.parseSort(helper.itemView.context)?.let{ helper.itemView.context.getString(R.string.parse_watch_to, it) }?: helper.itemView.context.getString(R.string.hint_watch_nothing)) +
+                when {
+                    eps?.any { it.status != "Air" } == true -> airTo?.parseSort(helper.itemView.context)?.let{ " / " + helper.itemView.context.getString(R.string.parse_update_to, it)  }?:""
+                    item.subject?.eps_count?:0 > 0 -> " / "+ helper.itemView.context.getString(R.string.phrase_full_eps, item.subject?.eps_count)
+                    else -> ""
+                }
         helper.setText(R.id.item_summary, if(item.ep_status == -1) item.subject?.summary else watchep)
         Glide.with(helper.itemView.item_cover)
                 .load(item.subject?.images?.getImage(helper.itemView.context))
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionPagerAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionPagerAdapter.kt
index 215d6cb..df32b95 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionPagerAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/collection/CollectionPagerAdapter.kt
@@ -20,8 +20,8 @@ import soko.ekibun.bangumi.api.bangumi.bean.SubjectCollection
 import soko.ekibun.bangumi.ui.main.MainActivity
 import soko.ekibun.bangumi.ui.subject.SubjectActivity
 
-class CollectionPagerAdapter(context: Context, val fragment: CollectionFragment, private val pager: ViewPager) : PagerAdapter(){
-    private val tabList = context.resources.getStringArray(R.array.collection_status)
+class CollectionPagerAdapter(private val context: Context, val fragment: CollectionFragment, private val pager: ViewPager) : PagerAdapter(){
+    private var tabList = context.resources.getStringArray(R.array.collection_status_anime)
     private val subjectTypeView = SubjectTypeView(fragment.item_type) { reset() }
 
     init{
@@ -66,6 +66,9 @@ class CollectionPagerAdapter(context: Context, val fragment: CollectionFragment,
     }
 
     fun reset() {
+        tabList = context.resources.getStringArray(CollectionStatusType.getTypeNamesResId(subjectTypeView.getType()))
+        notifyDataSetChanged()
+
         items.forEach {  (it.value.second.tag as? RecyclerView)?.tag = null }
         pageIndex.clear()
         loadCollectionList()
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineAdapter.kt
index 75c4099..e45c3d9 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineAdapter.kt
@@ -40,8 +40,8 @@ class TimeLineAdapter(val ua: String, data: MutableList<TimeLine>? = null) :
         //del
         helper.itemView.item_del.visibility = if(item.t.delUrl.isNullOrEmpty()) View.INVISIBLE else View.VISIBLE
         helper.itemView.item_del.setOnClickListener {
-            AlertDialog.Builder(helper.itemView.context).setTitle("删除这条时间线？")
-                    .setNegativeButton("取消") { _, _ -> }.setPositiveButton("确定") { _, _ ->
+            AlertDialog.Builder(helper.itemView.context).setMessage(R.string.timeline_dialog_remove)
+                    .setNegativeButton(R.string.cancel) { _, _ -> }.setPositiveButton(R.string.ok) { _, _ ->
                         ApiHelper.buildHttpCall("${item.t.delUrl}&ajax=1", mapOf("User-Agent" to ua)) {
                             it.body()?.string()?.contains("\"status\":\"ok\"") == true
                         }.enqueue(ApiHelper.buildCallback<Boolean>(helper.itemView.context, {
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineFragment.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineFragment.kt
index a7423c9..b370276 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineFragment.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/home/fragment/timeline/TimeLineFragment.kt
@@ -49,7 +49,7 @@ class TimeLineFragment: HomeTabFragment(R.layout.fragment_timeline){
             var draft = ""
             item_new?.setOnClickListener {
                 val dialog = ReplyDialog()
-                dialog.hint = "添加动态"
+                dialog.hint = context?.getString(R.string.timeline_dialog_add)?:""
                 dialog.draft = draft
                 dialog.callback = {string, send ->
                     if(send){
@@ -64,7 +64,7 @@ class TimeLineFragment: HomeTabFragment(R.layout.fragment_timeline){
                                 if(item_pager?.currentItem?:2 !in 0..1) item_pager?.currentItem = 1
                                 adapter.pageIndex[item_pager?.currentItem?:0] = 0
                                 adapter.loadTopicList()
-                            }else Snackbar.make(item_pager, "提交出现了一些问题，请稍后再试", Snackbar.LENGTH_SHORT).show()
+                            }else Snackbar.make(item_pager, R.string.hint_submit_error, Snackbar.LENGTH_SHORT).show()
                         }){ })
                     }else draft = string
                 }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/index/IndexPagerAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/index/IndexPagerAdapter.kt
index 5051568..d59d870 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/index/IndexPagerAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/main/fragment/index/IndexPagerAdapter.kt
@@ -25,6 +25,7 @@ class IndexPagerAdapter(private val fragment: IndexFragment, private val pager:
     }
 
     override fun getPageTitle(pos: Int): CharSequence{
+        //TODO
         return "${pos/12 + 1000}\n${pos%12+1}月"
     }
 
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchAdapter.kt
index 4dcdedf..0d297e8 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchAdapter.kt
@@ -16,7 +16,7 @@ class SearchAdapter(data: MutableList<Subject>? = null) :
     override fun convert(helper: BaseViewHolder, item: Subject) {
         helper.setText(R.id.item_title, (if(item.collect) " " else "")+ item.getPrettyName())
         helper.setText(R.id.item_name_jp, item.name)
-        helper.setText(R.id.item_summary, SubjectType.getDescription(item.type))
+        helper.setText(R.id.item_summary, helper.itemView.context.getString(SubjectType.getDescription(item.type)))
         helper.itemView.item_chase.visibility = if(item.collect) View.VISIBLE else View.GONE
         Glide.with(helper.itemView.item_cover)
                 .load(item.images?.getImage(helper.itemView.context))
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchHistoryAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchHistoryAdapter.kt
new file mode 100644
index 0000000..3d8c763
--- /dev/null
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchHistoryAdapter.kt
@@ -0,0 +1,14 @@
+package soko.ekibun.bangumi.ui.search
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import soko.ekibun.bangumi.R
+
+class SearchHistoryAdapter(data: MutableList<String>? = null) :
+        BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_search_history, data) {
+
+    override fun convert(helper: BaseViewHolder, item: String) {
+        helper.setText(R.id.item_search_key, item)
+        helper.addOnClickListener(R.id.item_remove_key)
+    }
+}
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchPresenter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchPresenter.kt
index d003482..715e0c3 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchPresenter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/search/SearchPresenter.kt
@@ -1,27 +1,59 @@
 package soko.ekibun.bangumi.ui.search
 
+import android.support.v7.app.AlertDialog
 import android.support.v7.widget.LinearLayoutManager
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.View
 import android.webkit.WebView
+import android.widget.TextView
 import kotlinx.android.synthetic.main.activity_search.*
 import retrofit2.Call
+import soko.ekibun.bangumi.R
 import soko.ekibun.bangumi.api.ApiHelper
 import soko.ekibun.bangumi.api.bangumi.Bangumi
 import soko.ekibun.bangumi.api.bangumi.bean.MonoInfo
 import soko.ekibun.bangumi.api.bangumi.bean.Subject
+import soko.ekibun.bangumi.model.SearchHistoryModel
 import soko.ekibun.bangumi.ui.subject.SubjectActivity
 import soko.ekibun.bangumi.ui.web.WebActivity
 
 class SearchPresenter(private val context: SearchActivity) {
+    val searchHistoryModel by lazy { SearchHistoryModel(context) }
+
     val typeView = SearchTypeView(context.item_type) {
         search(lastKey, true)
     }
 
     val monoAdapter = MonoAdapter()
     val subjectAdapter = SearchAdapter()
+    val searchHistoryAdapter = SearchHistoryAdapter()
 
     init{
+        context.search_history.layoutManager = LinearLayoutManager(context)
+        context.search_history.adapter = searchHistoryAdapter
+        val emptyTextView = TextView(context)
+        emptyTextView.text = context.getString(R.string.search_hint_no_history)
+        emptyTextView.gravity = Gravity.CENTER
+        searchHistoryAdapter.emptyView = emptyTextView
+        searchHistoryAdapter.setNewData(searchHistoryModel.getHistoryList())
+        searchHistoryAdapter.setOnItemClickListener { _, _, position ->
+            context.search_box.setText(searchHistoryAdapter.data[position])
+            search(context.search_box.text.toString())
+        }
+        searchHistoryAdapter.setOnItemChildClickListener { _, _, position ->
+            searchHistoryModel.removeHistory(searchHistoryAdapter.data[position])
+            searchHistoryAdapter.remove(position)
+        }
+        context.search_history_remove.setOnClickListener {
+            AlertDialog.Builder(context).setMessage(R.string.search_dialog_history_clear).setNegativeButton(R.string.cancel){ _, _ -> }.setPositiveButton(R.string.ok){ _, _ ->
+                searchHistoryModel.clearHistory()
+                searchHistoryAdapter.setNewData(null)
+            }.show()
+        }
+
         context.search_list.layoutManager = LinearLayoutManager(context)
         subjectAdapter.setEnableLoadMore(true)
         subjectAdapter.setOnLoadMoreListener({
@@ -38,11 +70,22 @@ class SearchPresenter(private val context: SearchActivity) {
             WebActivity.launchUrl(context, monoAdapter.data[position]?.url, "")
         }
 
+        context.search_box.setOnKeyListener { _, keyCode, _ ->
+            if(keyCode == KeyEvent.KEYCODE_ENTER) {
+                search(context.search_box.text.toString())
+                true
+            }else false
+        }
+
+        context.search_swipe.visibility = View.INVISIBLE
         context.search_box.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun afterTextChanged(s: Editable?) {}
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                search(s.toString())
+                lastKey = ""
+                context.search_swipe.visibility = View.INVISIBLE
+                searchHistoryAdapter.setNewData(searchHistoryModel.getHistoryList().filter { s.isEmpty() || it.contains(s) })
+                context.search_history_remove.visibility = if(s.isEmpty()) View.VISIBLE else View.INVISIBLE
             }
         })
 
@@ -68,6 +111,10 @@ class SearchPresenter(private val context: SearchActivity) {
             subjectCall?.cancel()
             monoCall?.cancel()
         }else{
+            context.search_swipe.visibility = View.VISIBLE
+            searchHistoryModel.addHistory(key)
+            searchHistoryAdapter.setNewData(searchHistoryModel.getHistoryList())
+
             if(loadCount == 0)
                 context.search_swipe?.isRefreshing = true
             subjectCall?.cancel()
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditProgressDialog.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditProgressDialog.kt
index 5921d92..b61a106 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditProgressDialog.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditProgressDialog.kt
@@ -46,10 +46,11 @@ class EditProgressDialog: DialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.dialog_edit_progress, container)
 
+        //TODO
         view.item_eps.setText(subject.ep_status.toString())
-        view.item_eps_info.text = "${ if(subject.eps_count == 0) "" else "/${subject.eps_count}" } 话"
+        view.item_eps_info.text = "${ if(subject.eps_count == 0) "" else "/${subject.eps_count}" } ${view.context.getString(R.string.ep_unit)}"
         view.item_vol.setText(subject.vol_status.toString())
-        view.item_vol_info.text = "${ if(subject.vol_count == 0) "" else "/${subject.vol_count}" } 章"
+        view.item_vol_info.text = "${ if(subject.vol_count == 0) "" else "/${subject.vol_count}" } ${view.context.getString(R.string.vol_unit)}"
         view.item_vol_panel.visibility = if(subject.has_vol) View.VISIBLE else View.GONE
 
         view.item_outside.setOnClickListener {
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditSubjectDialog.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditSubjectDialog.kt
index e16fe0a..9944844 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditSubjectDialog.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EditSubjectDialog.kt
@@ -47,6 +47,13 @@ class EditSubjectDialog: DialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.dialog_edit_subject, container)
 
+        val collectionStatusNames = inflater.context.resources.getStringArray(CollectionStatusType.getTypeNamesResId(subject.type))
+        view.radio_wish.text = collectionStatusNames[0]
+        view.radio_collect.text = collectionStatusNames[1]
+        view.radio_do.text = collectionStatusNames[2]
+        view.radio_hold.text = collectionStatusNames[3]
+        view.radio_dropped.text = collectionStatusNames[4]
+
         val selectMap = mapOf(
                 CollectionStatusType.WISH to R.id.radio_wish,
                 CollectionStatusType.COLLECT to R.id.radio_collect,
@@ -70,8 +77,8 @@ class EditSubjectDialog: DialogFragment() {
             val editText = EditText(view.context)
             AlertDialog.Builder(view.context)
                     .setView(editText)
-                    .setTitle("添加标签")
-                    .setPositiveButton("提交"){ _, _ ->
+                    .setTitle(R.string.subject_dialog_add_tag)
+                    .setPositiveButton(R.string.submit){ _, _ ->
                         adapter.addData(editText.text.split(" ").filter { it.isNotEmpty() })
                     }.show()
         }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EpisodeAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EpisodeAdapter.kt
index cf4a228..1bcb7f2 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/EpisodeAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/EpisodeAdapter.kt
@@ -31,7 +31,7 @@ class EpisodeAdapter(data: MutableList<SelectableSectionEntity<Episode>>? = null
     }
 
     override fun convert(helper: BaseViewHolder, item: SelectableSectionEntity<Episode>) {
-        helper.setText(R.id.item_title, item.t.parseSort())
+        helper.setText(R.id.item_title, item.t.parseSort(helper.itemView.context))
         helper.setText(R.id.item_desc, if(item.t.name_cn.isNullOrEmpty()) item.t.name else item.t.name_cn)
         val color = ResourceUtil.resolveColorAttr(helper.itemView.context,
                 when {
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SmallEpisodeAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SmallEpisodeAdapter.kt
index 5323019..8470a70 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SmallEpisodeAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SmallEpisodeAdapter.kt
@@ -15,7 +15,7 @@ class SmallEpisodeAdapter(data: MutableList<Episode>? = null) :
         (R.layout.item_episode_small, data) {
 
     override fun convert(helper: BaseViewHolder, item: Episode) {
-        helper.setText(R.id.item_title, item.parseSort())
+        helper.setText(R.id.item_title, item.parseSort(helper.itemView.context))
         helper.setText(R.id.item_desc, if(item.name_cn.isNullOrEmpty()) item.name else item.name_cn)
         val color = ResourceUtil.resolveColorAttr(helper.itemView.context,
                 when {
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectPresenter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectPresenter.kt
index 81b26be..049ba96 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectPresenter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectPresenter.kt
@@ -182,11 +182,12 @@ class SubjectPresenter(private val context: SubjectActivity){
     @SuppressLint("SetTextI18n")
     private fun openEpisode(episode: Episode, subject: Subject, eps: List<Episode>){
         val view = context.layoutInflater.inflate(R.layout.dialog_epsode, context.item_collect, false)
-        view.item_episode_title.text = episode.parseSort() + " " + if(episode.name_cn.isNullOrEmpty()) episode.name else episode.name_cn
+        //TODO
+        view.item_episode_title.text = episode.parseSort(context) + " " + if(episode.name_cn.isNullOrEmpty()) episode.name else episode.name_cn
         view.item_episode_desc.text = (if(episode.name_cn.isNullOrEmpty()) "" else episode.name + "\n") +
-                (if(episode.airdate.isNullOrEmpty()) "" else "首播：" + episode.airdate + "\n") +
-                (if(episode.duration.isNullOrEmpty()) "" else "时长：" + episode.duration + "\n") +
-                "讨论 (+" + episode.comment + ")"
+                (if(episode.airdate.isNullOrEmpty()) "" else  context.getString(R.string.phrase_air_date, episode.airdate) + "\n") +
+                (if(episode.duration.isNullOrEmpty()) "" else context.getString(R.string.phrase_duration, episode.duration) + "\n") +
+                context.getString(R.string.phrase_comment, episode.comment)
         view.item_episode_title.setOnClickListener {
             WebActivity.launchUrl(context, "${Bangumi.SERVER}/m/topic/ep/${episode.id}", "")
         }
@@ -194,7 +195,7 @@ class SubjectPresenter(private val context: SubjectActivity){
         val emptyTextView = TextView(context)
         val dp4 = (context.resources.displayMetrics.density * 4 + 0.5f).toInt()
         emptyTextView.setPadding(dp4,dp4,dp4,dp4)
-        emptyTextView.text = "暂无播放源"
+        emptyTextView.setText(R.string.hint_no_play_source)
         adapter.emptyView = emptyTextView
         adapter.setOnItemClickListener { _, _, position ->
             WebActivity.launchUrl(context, adapter.data[position].url, "")
@@ -273,7 +274,7 @@ class SubjectPresenter(private val context: SubjectActivity){
         subjectCall?.enqueue(ApiHelper.buildCallback(context, {
             subject = it
             refreshLines(it)
-            refreshCollection(it)
+            refreshCollection()
             subjectView.updateSubject(it)
         }, {}))
 
@@ -354,17 +355,17 @@ class SubjectPresenter(private val context: SubjectActivity){
     }
 
     private fun removeCollection(subject: Subject){
-        AlertDialog.Builder(context).setTitle("删除这个条目收藏？")
-                .setNegativeButton("取消") { _, _ -> }.setPositiveButton("确定") { _, _ ->
+        AlertDialog.Builder(context).setTitle(R.string.collection_dialog_remove)
+                .setNegativeButton(R.string.cancel) { _, _ -> }.setPositiveButton(R.string.ok) { _, _ ->
                     ApiHelper.buildHttpCall("${Bangumi.SERVER}/subject/${subject.id}/remove?gh=${context.formhash}", mapOf("User-Agent" to context.ua)){ it.code() == 200 }
                             .enqueue(ApiHelper.buildCallback(context, {
                                 if(it) subject.interest = Collection()
-                                refreshCollection(subject)
+                                refreshCollection()
                             }, {}))
                 }.show()
     }
 
-    private fun refreshCollection(subject: Subject){
+    private fun refreshCollection(){
         val body = subject.interest?:Collection()
         val status = body.status
         context.item_collect_image.setImageDrawable(context.resources.getDrawable(
@@ -374,11 +375,11 @@ class SubjectPresenter(private val context: SubjectActivity){
         context.item_collect.setOnClickListener{
             if(context.formhash.isEmpty()) return@setOnClickListener
             val popupMenu = PopupMenu(context, context.item_collect)
-            val statusList = context.resources.getStringArray(R.array.collection_status)
+            val statusList = context.resources.getStringArray(CollectionStatusType.getTypeNamesResId(subject.type))
             statusList.forEachIndexed { index, s ->
                 popupMenu.menu.add(Menu.NONE, Menu.FIRST + index, index, s) }
             if(status != null)
-                popupMenu.menu.add(Menu.NONE, Menu.FIRST + statusList.size, statusList.size, "删除")
+                popupMenu.menu.add(Menu.NONE, Menu.FIRST + statusList.size, statusList.size, R.string.delete)
             popupMenu.setOnMenuItemClickListener {menu->
                 if(menu.itemId == Menu.FIRST + statusList.size){
                     removeCollection(subject)
@@ -389,7 +390,7 @@ class SubjectPresenter(private val context: SubjectActivity){
                 Bangumi.updateCollectionStatus(subject, context.formhash, context.ua,
                         newStatus, newTags, body.comment?:"", body.rating, body.private).enqueue(ApiHelper.buildCallback(context,{
                     subject.interest = it
-                    refreshCollection(subject)
+                    refreshCollection()
                 },{}))
                 false
             }
@@ -399,7 +400,7 @@ class SubjectPresenter(private val context: SubjectActivity){
         context.item_collect.setOnLongClickListener {
             EditSubjectDialog.showDialog(context, subject, body, context.formhash, context.ua){
                 if(it) removeCollection(subject)
-                else refreshCollection(subject)
+                else refreshCollection()
             }
             true
         }
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectView.kt b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectView.kt
index 23b99ae..8fc2075 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectView.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/subject/SubjectView.kt
@@ -185,7 +185,7 @@ class SubjectView(private val context: SubjectActivity){
             context.title_collapse.layoutParams = layoutParams
             (context.item_subject.layoutParams as CollapsingToolbarLayout.LayoutParams).topMargin = context.toolbar_container.height
         }
-        context.item_info.text = if(subject.typeString.isNullOrEmpty()) SubjectType.getDescription(subject.type) else subject.typeString
+        context.item_info.text = if(subject.typeString.isNullOrEmpty()) context.getString(SubjectType.getDescription(subject.type)) else subject.typeString
         context.item_subject_title.visibility = View.GONE
         val saleDate = subject.infobox?.firstOrNull { it.first in arrayOf("发售日期", "发售日", "发行日期") }
         val artist = subject.infobox?.firstOrNull { it.first.substringBefore(" ") in arrayOf("动画制作", "作者", "开发", "游戏制作", "艺术家") }
@@ -222,7 +222,7 @@ class SubjectView(private val context: SubjectActivity){
             photoView.mLongClickListener = {
                 val systemUiVisibility = popWindow.contentView.systemUiVisibility
                 AlertDialog.Builder(context)
-                        .setItems(arrayOf("分享"))
+                        .setItems(arrayOf(context.getString(R.string.share)))
                         { _, _ ->
                             AppUtil.shareDrawable(context, photoView.drawable)
                         }.setOnDismissListener {
@@ -278,18 +278,21 @@ class SubjectView(private val context: SubjectActivity){
         }
 
         detail.item_progress.visibility = if(subject.formhash?.isNotEmpty() == true && subject.interest?.status?.type == CollectionStatusType.DO && subject.type in listOf(SubjectType.ANIME, SubjectType.REAL, SubjectType.BOOK)) View.VISIBLE else View.GONE
-        detail.item_progress_info.text = "看到 ${ if(subject.has_vol) "第 ${subject.vol_status}${ if(subject.vol_count == 0) "" else "/${subject.vol_count}" } 章 " else ""}第 ${subject.ep_status}${ if(subject.eps_count == 0) "" else "/${subject.eps_count}" } 话"
+        detail.item_progress_info.text = context.getString(R.string.phrase_progress,
+                (if(subject.has_vol) context.getString(R.string.parse_sort_vol, "${subject.vol_status}${ if(subject.vol_count == 0) "" else "/${subject.vol_count}" }") + " " else "") +
+                        context.getString(R.string.parse_sort_ep, "${subject.ep_status}${ if(subject.eps_count == 0) "" else "/${subject.eps_count}"}"))
     }
 
     fun updateEpisode(episodes: List<Episode>){
         if(episodes.none { it.id != 0 }) return
         val mainEps = episodes.filter { it.type == Episode.TYPE_MAIN || it.type == Episode.TYPE_MUSIC }
-        val eps = mainEps.filter { (it.status ?: "") in listOf("Air") }.size
-        detail.episode_detail.text = context.getString(if(eps == mainEps.size) R.string.phrase_full else R.string.phrase_updating, eps)
+        val eps = mainEps.filter { (it.status ?: "") in listOf("Air") }
+        detail.episode_detail.text = if(eps.size == mainEps.size) context.getString(R.string.phrase_full_eps, eps.size) else
+            eps.lastOrNull()?.parseSort(context)?.let { context.getString(R.string.parse_update_to, it)}?: context.getString(R.string.hint_air_nothing)
 
         val maps = LinkedHashMap<String, List<Episode>>()
         episodes.forEach {
-            val key = it.cat?:Episode.getTypeName(it.type)
+            val key = it.cat?: context.getString(Episode.getTypeName(it.type))
             maps[key] = (maps[key]?:ArrayList()).plus(it)
         }
         episodeAdapter.setNewData(null)
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/PhotoPagerAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/PhotoPagerAdapter.kt
index afdd3ec..a2874be 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/topic/PhotoPagerAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/topic/PhotoPagerAdapter.kt
@@ -5,6 +5,7 @@ import android.support.v7.app.AlertDialog
 import android.view.View
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
+import soko.ekibun.bangumi.R
 import soko.ekibun.bangumi.ui.view.DragPhotoView
 import soko.ekibun.bangumi.util.AppUtil
 
@@ -20,7 +21,7 @@ class PhotoPagerAdapter(private val items: List<String>, private val onDismiss:
         photoView.mLongClickListener = {
             val systemUiVisibility = container.systemUiVisibility
             AlertDialog.Builder(container.context)
-                    .setItems(arrayOf("分享"))
+                    .setItems(arrayOf(container.context.getString(R.string.share)))
                     { _, _ ->
                         AppUtil.shareDrawable(container.context, photoView.drawable)
                     }.setOnDismissListener {
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/PostAdapter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/PostAdapter.kt
index b79b4dc..7112433 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/topic/PostAdapter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/topic/PostAdapter.kt
@@ -20,7 +20,6 @@ import soko.ekibun.bangumi.util.HtmlTagHandler
 import java.net.URI
 import android.text.style.ClickableSpan
 import android.text.style.URLSpan
-import android.util.Log
 import android.util.Size
 import android.widget.TextView
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
@@ -57,7 +56,7 @@ class PostAdapter(data: MutableList<TopicPost>? = null) :
         helper.itemView.item_edit.visibility = helper.itemView.item_del.visibility
 
         helper.itemView.item_expand.visibility = if (item.hasSubItem()) View.VISIBLE else View.GONE
-        helper.itemView.item_expand.text = if(item.isExpanded) "收起" else "展开"
+        helper.itemView.item_expand.setText(if(item.isExpanded) R.string.collapse else R.string.expand)
         helper.itemView.item_expand.setOnClickListener {
             val index = data.indexOfFirst { post -> post === item }
             if(item.isExpanded) collapse(index) else expand(index)
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt
index d77e6db..096ee72 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt
@@ -39,7 +39,7 @@ class TopicPresenter(private val context: TopicActivity) {
                 if(!topic.formhash.isNullOrEmpty()) ResourceUtil.getDrawable(context, R.drawable.ic_send) else null,//right
                 null)
         context.item_reply.setOnClickListener {
-            topic.formhash?.let{ formhash -> showReplyPopupWindow(topic.post, FormBody.Builder().add("lastview", topic.lastview!!).add("formhash", formhash),"", "回复 ${topic.title}") }?:{
+            topic.formhash?.let{ formhash -> showReplyPopupWindow(topic.post, FormBody.Builder().add("lastview", topic.lastview!!).add("formhash", formhash),"", context.getString(R.string.parse_hint_reply_topic, topic.title)) }?:{
                 if(!topic.errorLink.isNullOrEmpty()) WebActivity.launchUrl(context, topic.errorLink, "")
             }()
         }
@@ -58,11 +58,11 @@ class TopicPresenter(private val context: TopicActivity) {
                             .add("formhash", topic.formhash!!)
                             .add("topic_id", post.pst_mid)
                             .add("related", post.relate)
-                            .add("post_uid", post.pst_uid), comment, "回复 ${post.nickname} 的评论", post.pst_id)
+                            .add("post_uid", post.pst_uid), comment, context.getString(R.string.parse_hint_reply_post, post.nickname), post.pst_id)
                 }
                 R.id.item_del -> {
-                    AlertDialog.Builder(context).setTitle("确认删除？")
-                            .setNegativeButton("取消") { _, _ -> }.setPositiveButton("确定") { _, _ ->
+                    AlertDialog.Builder(context).setMessage(R.string.reply_dialog_remove)
+                            .setNegativeButton(R.string.cancel) { _, _ -> }.setPositiveButton(R.string.ok) { _, _ ->
                                 if (post.floor == 1) {
                                     val url = topic.post.replace(Bangumi.SERVER, "${Bangumi.SERVER}/erase").replace("/new_reply", "?gh=${topic.formhash}&ajax=1")
                                     ApiHelper.buildHttpCall(url, mapOf("User-Agent" to ua)) {
@@ -109,7 +109,7 @@ class TopicPresenter(private val context: TopicActivity) {
                             WebActivity.launchUrl(context, url)
                             return@buildCallback
                         }else{
-                            buildPopupWindow("修改主题\"${topic.title}\""+if(post.floor == 1) "" else "的回复", it){inputString, send->
+                            buildPopupWindow(context.getString(if(post.floor == 1) R.string.parse_hint_modify_topic else R.string.parse_hint_modify_post, topic.title), it){inputString, send->
                                 if(send){
                                     ApiHelper.buildHttpCall(url, mapOf("User-Agent" to ua), body = FormBody.Builder()
                                             .add("formhash", topic.formhash!!)
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt
index 1142f20..7736241 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt
@@ -93,10 +93,10 @@ class TopicView(private val context: TopicActivity){
         adapter.setOnLoadMoreListener({adapter.loadMoreEnd()}, context.item_list)
         adapter.setEnableLoadMore(true)
         context.item_reply.text = when {
-            !topic.formhash.isNullOrEmpty() -> context.getString(R.string.reply_hint)
+            !topic.formhash.isNullOrEmpty() -> context.getString(R.string.hint_reply)
             !topic.error.isNullOrEmpty() -> topic.error
-            topic.replies.isEmpty() -> "这里什么都没有哟"
-            else -> "登录后才可以评论哦"
+            topic.replies.isEmpty() -> context.getString(R.string.hint_empty_topic)
+            else -> context.getString(R.string.hint_login_topic)
         }
 
         adapter.setOnItemChildClickListener { _, v, position ->
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/web/WebActivity.kt b/app/src/main/java/soko/ekibun/bangumi/ui/web/WebActivity.kt
index 40fe070..7a0fb6f 100644
--- a/app/src/main/java/soko/ekibun/bangumi/ui/web/WebActivity.kt
+++ b/app/src/main/java/soko/ekibun/bangumi/ui/web/WebActivity.kt
@@ -77,7 +77,7 @@ class WebActivity : SwipeBackActivity() {
                 }
             }
         }else{
-            title = getString(R.string.login_auth)
+            title = getString(R.string.login)
             val authUrl = "${Bangumi.SERVER}/login"
             webview.webChromeClient = object: WebChromeClient() {
                 override fun onProgressChanged(view: WebView, newProgress: Int) {
diff --git a/app/src/main/res/drawable/bg_notify_badge.xml b/app/src/main/res/drawable/bg_notify_badge.xml
new file mode 100644
index 0000000..f2e1df1
--- /dev/null
+++ b/app/src/main/res/drawable/bg_notify_badge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@android:color/white"/>
+    <corners android:radius="10000dp" />
+    <stroke
+            android:width="1dp"
+            android:color="?colorPrimaryBackground"
+            />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/action_notify.xml b/app/src/main/res/layout/action_notify.xml
index 4f34396..438c481 100644
--- a/app/src/main/res/layout/action_notify.xml
+++ b/app/src/main/res/layout/action_notify.xml
@@ -11,7 +11,8 @@
             android:layout_centerInParent="true"
             android:tint="@android:color/white"
             android:scaleType="center"
-            app:srcCompat="@drawable/ic_notifications"/>
+            app:srcCompat="@drawable/ic_notifications"
+            tools:ignore="ContentDescription"/>
 
     <TextView
             android:id="@+id/tv_badge"
@@ -20,13 +21,12 @@
             android:layout_centerInParent="true"
             android:translationX="8dp"
             android:translationY="-7dp"
-            android:paddingStart="3sp"
-            android:paddingEnd="3sp"
-            android:background="@drawable/bg_round_rect"
-            android:backgroundTint="?colorAccent"
+            android:paddingStart="3.5sp"
+            android:paddingEnd="3.5sp"
+            android:background="@drawable/bg_notify_badge"
             android:gravity="center"
             android:text="0"
-            android:textColor="@android:color/white"
+            android:textColor="?colorPrimaryBackground"
             android:textSize="8sp"
             tools:ignore="HardcodedText,SmallSp"/>
 
diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index 839513d..3834103 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -33,7 +33,7 @@
                   android:clickable="true"
                   android:foreground="?android:attr/selectableItemBackground"
                   android:focusable="true"
-                  android:text="@string/restart_app"/>
+                  android:text="@string/crash_restart_app"/>
         <TextView android:id="@+id/item_upload"
                   android:gravity="center"
                   android:padding="12dp"
@@ -43,7 +43,7 @@
                   android:clickable="true"
                   android:foreground="?android:attr/selectableItemBackground"
                   android:focusable="true"
-                  android:text="@string/upload_crash"/>
+                  android:text="@string/crash_upload_crash"/>
     </LinearLayout>
 </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index fad65d6..a1051d1 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -58,11 +58,43 @@
         </android.support.design.widget.CollapsingToolbarLayout>
 
     </android.support.design.widget.AppBarLayout>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:background="?android:colorBackground">
+            <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="12dp"
+                    android:text="@string/search_history"/>
+            <TextView
+                    android:id="@+id/search_history_remove"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_history_clear"
+                    android:clickable="true"
+                    android:padding="12dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:focusable="true"/>
+        </LinearLayout>
+        <android.support.v7.widget.RecyclerView
+                android:id="@+id/search_history"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+    </LinearLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/search_swipe"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="?android:colorBackground"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <android.support.v7.widget.RecyclerView
                 android:id="@+id/search_list"
diff --git a/app/src/main/res/layout/activity_subject.xml b/app/src/main/res/layout/activity_subject.xml
index 3bbe0cc..cc27fd1 100644
--- a/app/src/main/res/layout/activity_subject.xml
+++ b/app/src/main/res/layout/activity_subject.xml
@@ -165,7 +165,7 @@
                     android:id="@+id/item_progress_edit"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="修改"
+                    android:text="@string/subject_progress_edit"
                     android:clickable="true"
                     android:foreground="?android:attr/selectableItemBackground"
                     android:focusable="true"
@@ -186,7 +186,7 @@
                       android:layout_height="wrap_content"
                       android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                       android:padding="12dp"
-                      android:text="@string/linked_subjects"/>
+                      android:text="@string/subject_linked"/>
             <android.support.v7.widget.RecyclerView
                     android:id="@+id/linked_list"
                     android:layout_width="match_parent"
@@ -204,7 +204,7 @@
                       android:layout_height="wrap_content"
                       android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                       android:padding="12dp"
-                      android:text="@string/commend"/>
+                      android:text="@string/subject_commend"/>
             <android.support.v7.widget.RecyclerView
                     android:id="@+id/commend_list"
                     android:layout_width="match_parent"
@@ -226,7 +226,7 @@
                       android:visibility="gone"
                       android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                       android:padding="12dp"
-                      android:text="@string/comment"/>
+                      android:text="@string/subject_comment"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -256,7 +256,7 @@
             android:clickable="true"
             android:focusable="true"
             android:visibility="invisible">
-        <RelativeLayout
+        <android.support.constraint.ConstraintLayout
                 android:id="@+id/item_eps_button_box"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -286,12 +286,13 @@
                        app:layout_constraintBottom_toBottomOf="parent"
                        android:id="@+id/item_edit_ep"
                        app:layout_constraintEnd_toStartOf="@+id/item_close"
+                       app:layout_constraintStart_toStartOf="parent"
                        android:src="@drawable/ic_edit"
                        android:clickable="true"
                        android:background="?android:attr/selectableItemBackgroundBorderless"
                        android:focusable="true"
                        android:contentDescription="@string/episodes"/>
-        </RelativeLayout>
+        </android.support.constraint.ConstraintLayout>
         <TextView android:layout_width="0dp"
                   android:layout_height="match_parent"
                   android:textAppearance="@android:style/TextAppearance.Material.Subhead"
diff --git a/app/src/main/res/layout/activity_topic.xml b/app/src/main/res/layout/activity_topic.xml
index 782b69e..6a9f390 100644
--- a/app/src/main/res/layout/activity_topic.xml
+++ b/app/src/main/res/layout/activity_topic.xml
@@ -110,7 +110,8 @@
                             android:layout_marginRight="6dp"
                             android:layout_gravity="center_vertical"
                             android:tint="@android:color/white"
-                            android:src="@drawable/ic_chevron_right"/>
+                            android:src="@drawable/ic_chevron_right"
+                            tools:ignore="ContentDescription"/>
                     <TextView
                             android:id="@+id/title_slice_1"
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_edit_progress.xml b/app/src/main/res/layout/dialog_edit_progress.xml
index 108a858..61d5394 100644
--- a/app/src/main/res/layout/dialog_edit_progress.xml
+++ b/app/src/main/res/layout/dialog_edit_progress.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -67,7 +66,7 @@
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
                     android:textColor="?colorAccent"
-                    android:text="更新"/>
+                    android:text="@string/subject_dialog_update_progress"/>
         </LinearLayout>
         <View android:id="@+id/item_keyboard"
               android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_edit_subject.xml b/app/src/main/res/layout/dialog_edit_subject.xml
index 7138837..8430f67 100644
--- a/app/src/main/res/layout/dialog_edit_subject.xml
+++ b/app/src/main/res/layout/dialog_edit_subject.xml
@@ -23,7 +23,6 @@
                 android:layout_marginBottom="12dp"
                 android:orientation="horizontal">
             <RadioButton
-                    android:text="想看"
                     android:button="@null"
                     android:textAlignment="center"
                     android:textColor="@drawable/color_checkable"
@@ -35,7 +34,6 @@
                     android:id="@+id/radio_wish"
                     android:layout_weight="1"/>
             <RadioButton
-                    android:text="看过"
                     android:button="@null"
                     android:checked="true"
                     android:textAlignment="center"
@@ -48,7 +46,6 @@
                     android:id="@+id/radio_collect"
                     android:layout_weight="1"/>
             <RadioButton
-                    android:text="在看"
                     android:button="@null"
                     android:textAlignment="center"
                     android:textColor="@drawable/color_checkable"
@@ -60,7 +57,6 @@
                     android:id="@+id/radio_do"
                     android:layout_weight="1"/>
             <RadioButton
-                    android:text="搁置"
                     android:button="@null"
                     android:textAlignment="center"
                     android:textColor="@drawable/color_checkable"
@@ -72,7 +68,6 @@
                     android:id="@+id/radio_hold"
                     android:layout_weight="1"/>
             <RadioButton
-                    android:text="抛弃"
                     android:button="@null"
                     android:textAlignment="center"
                     android:textColor="@drawable/color_checkable"
@@ -101,7 +96,7 @@
                     android:layout_height="wrap_content"
                     android:padding="8dp"
                     android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:text="标签"/>
+                    android:text="@string/subject_tag"/>
             <android.support.v7.widget.RecyclerView
                     android:id="@+id/item_tag_list"
                     android:layout_width="wrap_content"
@@ -117,22 +112,24 @@
                     android:padding="2dp"
                     android:translationX="-20dp"
                     android:src="@drawable/ic_add"
+                    android:tint="?android:textColorPrimary"
                     android:background="@drawable/bg_round_rect_unchecked"
                     app:layout_constraintTop_toTopOf="@+id/item_tag_title"
                     app:layout_constraintBottom_toBottomOf="@+id/item_tag_title"
-                    app:layout_constraintRight_toRightOf="@+id/item_tag_list"/>
+                    app:layout_constraintRight_toRightOf="@+id/item_tag_list"
+                    android:contentDescription="@string/subject_dialog_add_tag"/>
         </LinearLayout>
         <soko.ekibun.bangumi.ui.view.CleanableEditText
                 android:id="@+id/item_comment"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
-                android:hint="@string/comment"
+                android:hint="@string/subject_comment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/textSizeMedium"/>
         <Switch
                 android:id="@+id/item_private"
-                android:text="@string/private_collection"
+                android:text="@string/subject_collection_private"
                 android:padding="8dp"
                 android:textAppearance="@android:style/TextAppearance.Material.Subhead"
                 android:layout_width="match_parent"
@@ -151,7 +148,7 @@
                     android:tintMode="src_in"
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
-                    android:text="删除收藏"/>
+                    android:text="@string/subject_collection_remove"/>
             <View android:layout_weight="1"
                   android:layout_height="match_parent"
                   android:layout_width="0dp"/>
@@ -164,7 +161,7 @@
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
                     android:textColor="?colorAccent"
-                    android:text="提交"/>
+                    android:text="@string/submit"/>
         </LinearLayout>
         <View android:id="@+id/item_keyboard"
               android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_epsode.xml b/app/src/main/res/layout/dialog_epsode.xml
index ba45596..7c2f4e8 100644
--- a/app/src/main/res/layout/dialog_epsode.xml
+++ b/app/src/main/res/layout/dialog_epsode.xml
@@ -31,7 +31,7 @@
             android:orientation="horizontal">
 
         <RadioButton
-                android:text="看过"
+                android:text="@string/episode_status_watch"
                 android:button="@null"
                 android:checked="true"
                 android:textAlignment="center"
@@ -44,7 +44,7 @@
                 android:id="@+id/radio_watch"
                 android:layout_weight="1"/>
         <RadioButton
-                android:text="看到"
+                android:text="@string/episode_status_watch_to"
                 android:button="@null"
                 android:textAlignment="center"
                 android:textColor="@drawable/color_checkable"
@@ -56,7 +56,7 @@
                 android:id="@+id/radio_watch_to"
                 android:layout_weight="1"/>
         <RadioButton
-                android:text="想看"
+                android:text="@string/episode_status_wish"
                 android:button="@null"
                 android:textAlignment="center"
                 android:textColor="@drawable/color_checkable"
@@ -68,7 +68,7 @@
                 android:id="@+id/radio_queue"
                 android:layout_weight="1"/>
         <RadioButton
-                android:text="抛弃"
+                android:text="@string/episode_status_drop"
                 android:button="@null"
                 android:textAlignment="center"
                 android:textColor="@drawable/color_checkable"
@@ -80,7 +80,7 @@
                 android:id="@+id/radio_drop"
                 android:layout_weight="1"/>
         <RadioButton
-                android:text="未看"
+                android:text="@string/episode_status_remove"
                 android:button="@null"
                 android:textAlignment="center"
                 android:textColor="@drawable/color_checkable"
diff --git a/app/src/main/res/layout/dialog_reply.xml b/app/src/main/res/layout/dialog_reply.xml
index d81b2e4..4ddd355 100644
--- a/app/src/main/res/layout/dialog_reply.xml
+++ b/app/src/main/res/layout/dialog_reply.xml
@@ -47,7 +47,8 @@
                     android:tintMode="src_in"
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_emoji_keyboard"/>
+                    app:srcCompat="@drawable/ic_emoji_keyboard"
+                    android:contentDescription="@string/desc_emoji"/>
             <ImageButton
                     android:id="@+id/item_btn_image"
                     android:layout_width="wrap_content"
@@ -56,7 +57,8 @@
                     android:tintMode="src_in"
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_image"/>
+                    app:srcCompat="@drawable/ic_image"
+                    android:contentDescription="@string/desc_image"/>
             <ImageButton
                     android:id="@+id/item_btn_format"
                     android:layout_width="wrap_content"
@@ -65,7 +67,8 @@
                     android:tintMode="src_in"
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_format"/>
+                    app:srcCompat="@drawable/ic_format"
+                    android:contentDescription="@string/desc_format"/>
             <View android:layout_weight="1"
                   android:layout_height="match_parent"
                   android:layout_width="0dp"/>
@@ -75,7 +78,8 @@
                     android:padding="6dp"
                     android:background="?android:attr/selectableItemBackground"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_send"/>
+                    app:srcCompat="@drawable/ic_send"
+                    android:contentDescription="@string/desc_send"/>
         </LinearLayout>
         <android.support.v7.widget.RecyclerView
                 android:id="@+id/item_emoji_list"
diff --git a/app/src/main/res/layout/fragment_rakuen.xml b/app/src/main/res/layout/fragment_rakuen.xml
index 032ac82..b85f57e 100644
--- a/app/src/main/res/layout/fragment_rakuen.xml
+++ b/app/src/main/res/layout/fragment_rakuen.xml
@@ -17,16 +17,17 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintTop_toBottomOf="@+id/item_tabs"
-            app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
     <android.support.design.widget.FloatingActionButton
             android:id="@+id/item_new"
             app:fabSize="normal"
-
             android:background="?colorAccent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/ic_add"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@drawable/ic_add"
             android:tint="@android:color/white"/>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_timeline.xml b/app/src/main/res/layout/fragment_timeline.xml
index ad774cd..28e6b6f 100644
--- a/app/src/main/res/layout/fragment_timeline.xml
+++ b/app/src/main/res/layout/fragment_timeline.xml
@@ -35,12 +35,12 @@
     <android.support.design.widget.FloatingActionButton
             android:id="@+id/item_new"
             app:fabSize="normal"
-
             android:background="?colorAccent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/ic_add"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@drawable/ic_add"
             android:tint="@android:color/white"/>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_calendar.xml b/app/src/main/res/layout/item_calendar.xml
index 3378e18..c5a286a 100644
--- a/app/src/main/res/layout/item_calendar.xml
+++ b/app/src/main/res/layout/item_calendar.xml
@@ -96,7 +96,7 @@
                     android:paddingStart="4dp"
                     android:paddingEnd="4dp"
                     android:background="@drawable/bg_round_rect"
-                    android:text="已追番"
+                    android:text="@string/hint_chased"
                     android:backgroundTint="?colorAccent"
                     app:layout_constraintLeft_toLeftOf="@+id/item_ep_name"
                     app:layout_constraintTop_toTopOf="@+id/item_title"
diff --git a/app/src/main/res/layout/item_emoji.xml b/app/src/main/res/layout/item_emoji.xml
index 7dd98ed..626985e 100644
--- a/app/src/main/res/layout/item_emoji.xml
+++ b/app/src/main/res/layout/item_emoji.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center">
@@ -10,5 +11,6 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:background="?android:attr/selectableItemBackground"
-            android:layout_height="36dp"/>
+            android:layout_height="36dp"
+            tools:ignore="ContentDescription"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_history.xml b/app/src/main/res/layout/item_search_history.xml
new file mode 100644
index 0000000..857adb7
--- /dev/null
+++ b/app/src/main/res/layout/item_search_history.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:padding="12dp"
+              tools:ignore="UseCompoundDrawables">
+    <TextView android:id="@+id/item_search_key"
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:layout_gravity="center_vertical"
+              android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
+    <ImageView android:id="@+id/item_remove_key"
+               android:layout_width="24dp"
+               android:layout_height="24dp"
+               android:padding="2dp"
+               android:layout_gravity="center_vertical"
+               android:clickable="true"
+               android:background="?android:attr/selectableItemBackgroundBorderless"
+               android:focusable="true"
+               android:src="@drawable/ic_clear"
+               android:contentDescription="@string/search_history_remove"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_subject.xml b/app/src/main/res/layout/item_subject.xml
index be612fa..e85090d 100644
--- a/app/src/main/res/layout/item_subject.xml
+++ b/app/src/main/res/layout/item_subject.xml
@@ -42,7 +42,7 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:background="@drawable/bg_round_rect"
-            android:text="已收藏"
+            android:text="@string/hint_collected"
             android:backgroundTint="?colorAccent"
             app:layout_constraintLeft_toLeftOf="@+id/item_name_jp"
             app:layout_constraintTop_toTopOf="@+id/item_title"
diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml
index b7e5eee..7bcb249 100644
--- a/app/src/main/res/layout/item_tag.xml
+++ b/app/src/main/res/layout/item_tag.xml
@@ -33,6 +33,7 @@
                 android:layout_width="12dp"
                 android:layout_height="12dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_clear"/>
+                android:src="@drawable/ic_clear"
+                android:contentDescription="@string/subject_dialog_remove_tag"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subject_blog.xml b/app/src/main/res/layout/subject_blog.xml
index 060c8d6..6665153 100644
--- a/app/src/main/res/layout/subject_blog.xml
+++ b/app/src/main/res/layout/subject_blog.xml
@@ -18,7 +18,7 @@
               android:layout_height="wrap_content"
               android:textAppearance="@android:style/TextAppearance.Material.Subhead"
               android:padding="12dp"
-              android:text="@string/blog"
+              android:text="@string/subject_blog"
               android:id="@+id/item_title"
               app:layout_constraintEnd_toStartOf="@+id/blog_detail"
               app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/subject_buttons.xml b/app/src/main/res/layout/subject_buttons.xml
index cfad4fe..8be33ca 100644
--- a/app/src/main/res/layout/subject_buttons.xml
+++ b/app/src/main/res/layout/subject_buttons.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content">
     <LinearLayout
@@ -18,7 +19,7 @@
                    android:layout_gravity="center_vertical"
                    android:tint="@android:color/white"
                    android:src="@drawable/ic_play"
-                   android:contentDescription="@string/collect"/>
+                   tools:ignore="ContentDescription"/>
         <TextView android:id="@+id/item_play_info"
                   android:textColor="@android:color/white"
                   android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/subject_topic.xml b/app/src/main/res/layout/subject_topic.xml
index aa3acf0..7d49bfd 100644
--- a/app/src/main/res/layout/subject_topic.xml
+++ b/app/src/main/res/layout/subject_topic.xml
@@ -18,7 +18,7 @@
               android:layout_height="wrap_content"
               android:textAppearance="@android:style/TextAppearance.Material.Subhead"
               android:padding="12dp"
-              android:text="@string/topics"
+              android:text="@string/subject_topics"
               android:id="@+id/item_title"
               app:layout_constraintEnd_toStartOf="@+id/topic_detail"
               app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/view_empty.xml b/app/src/main/res/layout/view_empty.xml
index 1b1e1b0..4f12e03 100644
--- a/app/src/main/res/layout/view_empty.xml
+++ b/app/src/main/res/layout/view_empty.xml
@@ -14,10 +14,10 @@
             app:layout_constraintBottom_toTopOf="@+id/item_info"
             app:layout_constraintVertical_bias="0.4"
             app:layout_constraintVertical_chainStyle="packed"
-            android:contentDescription="@string/info_empty"/>
+            android:contentDescription="@string/hint_empty"/>
     <TextView
             android:id="@+id/item_info"
-            android:text="@string/info_empty"
+            android:text="@string/hint_empty"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toBottomOf="@+id/imageView"
diff --git a/app/src/main/res/menu/drawer_main.xml b/app/src/main/res/menu/drawer_main.xml
index 6de1d5a..68e51b7 100644
--- a/app/src/main/res/menu/drawer_main.xml
+++ b/app/src/main/res/menu/drawer_main.xml
@@ -29,7 +29,7 @@
               app:showAsAction="ifRoom"/>
         <item android:id="@+id/nav_setting"
               android:icon="@drawable/ic_settings"
-              android:title="@string/title_activity_settings"
+              android:title="@string/settings"
               app:showAsAction="ifRoom"/>
         <item
             android:id="@+id/nav_night"
@@ -40,10 +40,6 @@
                 android:id="@+id/nav_logout"
                 android:icon="@drawable/ic_exit"
                 android:title="@string/logout"/>
-        <!--<item
-                android:id="@+id/nav_setting"
-                android:icon="@drawable/ic_settings"
-                android:title="@string/settings"/>-->
     </group>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list_browser_type.xml b/app/src/main/res/menu/list_browser_type.xml
index 06e331c..5c93313 100644
--- a/app/src/main/res/menu/list_browser_type.xml
+++ b/app/src/main/res/menu/list_browser_type.xml
@@ -1,102 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/collection_type_anime"
           android:title="@string/anime">
         <menu>
             <item android:id="@+id/collection_type_anime_all"
-                  android:title="全部动画"/>
+                  android:title="@string/anime_all"/>
             <item android:id="@+id/collection_type_anime_tv"
-                  android:title="TV动画"/>
+                  android:title="@string/anime_tv"/>
             <item android:id="@+id/collection_type_anime_web"
-                  android:title="WEB动画"/>
+                  android:title="@string/anime_web"/>
             <item android:id="@+id/collection_type_anime_ova"
-                  android:title="OVA动画"/>
+                  android:title="@string/anime_ova"/>
             <item android:id="@+id/collection_type_anime_movie"
-                  android:title="剧场版动画"/>
+                  android:title="@string/anime_movie"/>
             <item android:id="@+id/collection_type_anime_misc"
-                  android:title="其他动画"/>
+                  android:title="@string/anime_misc"/>
         </menu>
     </item>
     <item android:id="@+id/collection_type_book"
           android:title="@string/book">
         <menu>
             <item android:id="@+id/collection_type_book_all"
-                  android:title="全部书籍"/>
+                  android:title="@string/book_all"/>
             <item android:id="@+id/collection_type_book_comic"
-                  android:title="漫画"/>
+                  android:title="@string/book_comic"/>
             <item android:id="@+id/collection_type_book_novel"
-                  android:title="小说"/>
+                  android:title="@string/book_novel"/>
             <item android:id="@+id/collection_type_book_illustration"
-                  android:title="画集"/>
+                  android:title="@string/book_illustration"/>
             <item android:id="@+id/collection_type_book_misc"
-                  android:title="其他书籍"/>
+                  android:title="@string/book_misc"/>
         </menu>
     </item>
     <item android:id="@+id/collection_type_game"
           android:title="@string/game">
         <menu>
             <item android:id="@+id/collection_type_game_all"
-                  android:title="全部游戏"/>
+                  android:title="@string/game_all"/>
             <item android:id="@+id/collection_type_game_pc"
-                  android:title="PC游戏"/>
+                  android:title="@string/game_pc"/>
             <item android:id="@+id/collection_type_game_mac"
-                  android:title="Mac OS游戏"/>
+                  android:title="@string/game_mac"/>
             <item android:id="@+id/collection_type_game_ps4"
-                  android:title="PS4游戏"/>
+                  android:title="@string/game_ps4"/>
             <item android:id="@+id/collection_type_game_xbox_one"
-                  android:title="Xbox One游戏"/>
+                  android:title="@string/game_xbox_one"/>
             <item android:id="@+id/collection_type_game_ns"
-                  android:title="Nintendo Switch游戏"/>
+                  android:title="@string/game_ns"/>
             <item android:id="@+id/collection_type_game_wii_u"
-                  android:title="Wii U游戏"/>
+                  android:title="@string/game_wii_u"/>
             <item android:id="@+id/collection_type_game_ps3"
-                  android:title="PS3游戏"/>
+                  android:title="@string/game_ps3"/>
             <item android:id="@+id/collection_type_game_xbox360"
-                  android:title="Xbox360游戏"/>
+                  android:title="@string/game_xbox360"/>
             <item android:id="@+id/collection_type_game_wii"
-                  android:title="Wii游戏"/>
+                  android:title="@string/game_wii"/>
             <item android:id="@+id/collection_type_game_psv"
-                  android:title="PS Vita游戏"/>
+                  android:title="@string/game_psv"/>
             <item android:id="@+id/collection_type_game_3ds"
-                  android:title="3DS游戏"/>
+                  android:title="@string/game_3ds"/>
             <item android:id="@+id/collection_type_game_iphone"
-                  android:title="iOS游戏"/>
+                  android:title="@string/game_iphone"/>
             <item android:id="@+id/collection_type_game_android"
-                  android:title="Android游戏"/>
+                  android:title="@string/game_android"/>
             <item android:id="@+id/collection_type_game_arc"
-                  android:title="街机游戏"/>
+                  android:title="@string/game_arc"/>
             <item android:id="@+id/collection_type_game_nds"
-                  android:title="NDS游戏"/>
+                  android:title="@string/game_nds"/>
             <item android:id="@+id/collection_type_game_psp"
-                  android:title="PSP游戏"/>
+                  android:title="@string/game_psp"/>
             <item android:id="@+id/collection_type_game_ps2"
-                  android:title="PS2游戏"/>
+                  android:title="@string/game_ps2"/>
             <item android:id="@+id/collection_type_game_xbox"
-                  android:title="XBOX游戏"/>
+                  android:title="@string/game_xbox"/>
             <item android:id="@+id/collection_type_game_gamecube"
-                  android:title="GameCube游戏"/>
+                  android:title="@string/game_gamecube"/>
             <item android:id="@+id/collection_type_game_dreamcast"
-                  android:title="Dreamcast游戏"/>
+                  android:title="@string/game_dreamcast"/>
             <item android:id="@+id/collection_type_game_n64"
-                  android:title="Nintendo 64游戏"/>
+                  android:title="@string/game_n64"/>
             <item android:id="@+id/collection_type_game_ps"
-                  android:title="PlayStation游戏"/>
+                  android:title="@string/game_ps"/>
             <item android:id="@+id/collection_type_game_sfc"
-                  android:title="SFC游戏"/>
+                  android:title="@string/game_sfc"/>
             <item android:id="@+id/collection_type_game_fc"
-                  android:title="FC游戏"/>
+                  android:title="@string/game_fc"/>
             <item android:id="@+id/collection_type_game_ws"
-                  android:title="WonderSwan游戏"/>
+                  android:title="@string/game_ws"/>
             <item android:id="@+id/collection_type_game_wsc"
-                  android:title="WonderSwan Color游戏"/>
+                  android:title="@string/game_wsc"/>
             <item android:id="@+id/collection_type_game_ngp"
-                  android:title="NEOGEO Pocket Color游戏"/>
+                  android:title="@string/game_ngp"/>
             <item android:id="@+id/collection_type_game_GBA"
-                  android:title="GBA游戏"/>
+                  android:title="@string/game_gba"/>
             <item android:id="@+id/collection_type_game_vb"
-                  android:title="Virtual Boy游戏"/>
+                  android:title="@string/game_vb"/>
         </menu>
     </item>
     <item android:id="@+id/collection_type_music"
@@ -105,13 +103,13 @@
           android:title="@string/real">
         <menu>
             <item android:id="@+id/collection_type_real_all"
-                  android:title="全部剧集"/>
+                  android:title="@string/real_all"/>
             <item android:id="@+id/collection_type_real_jp"
-                  android:title="日剧"/>
+                  android:title="@string/real_jp"/>
             <item android:id="@+id/collection_type_real_en"
-                  android:title="欧美剧"/>
+                  android:title="@string/real_en"/>
             <item android:id="@+id/collection_type_real_cn"
-                  android:title="华语剧"/>
+                  android:title="@string/real_cn"/>
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/list_notify.xml b/app/src/main/res/menu/list_notify.xml
new file mode 100644
index 0000000..2bc8fb5
--- /dev/null
+++ b/app/src/main/res/menu/list_notify.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/notify_type_inbox"
+          android:title="@string/notify_inbox"/>
+    <item android:id="@+id/notify_type_notify"
+          android:title="@string/notify_notify"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list_search_type.xml b/app/src/main/res/menu/list_search_type.xml
index 74f998a..f0bb11b 100644
--- a/app/src/main/res/menu/list_search_type.xml
+++ b/app/src/main/res/menu/list_search_type.xml
@@ -13,9 +13,9 @@
     <item android:id="@+id/collection_type_real"
           android:title="@string/real"/>
     <item android:id="@+id/collection_type_mono"
-          android:title="人物"/>
+          android:title="@string/mono"/>
     <item android:id="@+id/collection_type_ctr"
-          android:title="虚构角色"/>
+          android:title="@string/mono_ctr"/>
     <item android:id="@+id/collection_type_psn"
-          android:title="现实人物"/>
+          android:title="@string/mono_psn"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list_timeline.xml b/app/src/main/res/menu/list_timeline.xml
index 3913439..7382393 100644
--- a/app/src/main/res/menu/list_timeline.xml
+++ b/app/src/main/res/menu/list_timeline.xml
@@ -4,7 +4,7 @@
     <item android:id="@+id/timeline_type_friend"
           android:title="@string/friend"/>
     <item android:id="@+id/timeline_type_all"
-          android:title="全站"/>
+          android:title="@string/all_site"/>
     <item android:id="@+id/timeline_type_self"
           android:title="@string/self"/>
 </menu>
\ 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 a5f5bc3..269e472 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,60 +1,57 @@
 <resources>
     <string name="app_name">Bangumi</string>
-    <string name="search_hint">搜索…</string>
-    <string name="desc_cover">番剧海报</string>
-
-    <string name="phrase_full">全 %1$d 话</string>
-    <string name="rate_count">%1$d人</string>
-    <string name="phrase_reply">%1$d 回复</string>
-    <string name="phrase_updating">更新至第 %1$d 话</string>
 
-    <string name="navigation_drawer_open">导航开</string>
-    <string name="navigation_drawer_close">导航关</string>
-    <string name="play_pause">播放</string>
-
-    <string name="share">分享</string>
-    <string name="calendar">时间表</string>
-    <string name="login_hint">点击头像登录</string>
-    <string name="login">登录</string>
-    <string name="night_mode">夜间模式</string>
-    <string name="login_auth">登录</string>
-    <string name="search">搜索</string>
-    <string name="logout">注销</string>
-    <string name="status">状态</string>
-    <string name="rate">评分</string>
-    <string name="comment">吐槽</string>
-    <string name="private_collection">仅自己可见</string>
-    <string name="anime">动画</string>
-    <string name="book">图书</string>
-    <string name="game">游戏</string>
-    <string name="music">音乐</string>
-    <string name="real">三次元</string>
-    <string name="episodes">章节</string>
-    <string name="linked_subjects">关联条目</string>
-    <string name="topics">讨论版</string>
-    <string name="blog">评论</string>
-    <string name="more">更多</string>
-    <string name="info_empty">什么都没有哦</string>
+    <!-- common -->
     <string name="collect">收藏</string>
-    <string name="open_browser">在浏览器中打开</string>
-    <string name="index">索引</string>
-    <string name="home">主页</string>
-    <string name="rakuen">超展开</string>
-    <string name="timeline">时间胶囊</string>
-    <string name="reply">回复</string>
-    <string name="delete">删除</string>
-    <string name="edit">编辑</string>
-    <string name="reply_hint">不吐槽一下吗</string>
-    <string name="bold">粗体字</string>
-    <string name="italic">斜体字</string>
-    <string name="strike">删除线</string>
-    <string name="underline">下划线</string>
-    <string name="mask">马赛克</string>
-    <string name="upload_crash">上传崩溃日志</string>
-    <string name="restart_app">重新启动应用</string>
-    <string name="cache">离线缓存</string>
-    <string name="refresh">刷新</string>
-
+    <string name="subject">条目</string>
+    <string name="episodes">章节</string>
+    <string-array name="collection_status_anime">
+        <item>想看</item>
+        <item>看过</item>
+        <item>在看</item>
+        <item>搁置</item>
+        <item>抛弃</item>
+    </string-array>
+    <string-array name="collection_status_book">
+        <item>想读</item>
+        <item>读过</item>
+        <item>在读</item>
+        <item>搁置</item>
+        <item>抛弃</item>
+    </string-array>
+    <string-array name="collection_status_music">
+        <item>想听</item>
+        <item>听过</item>
+        <item>在听</item>
+        <item>搁置</item>
+        <item>抛弃</item>
+    </string-array>
+    <string-array name="collection_status_game">
+        <item>想玩</item>
+        <item>玩过</item>
+        <item>在玩</item>
+        <item>搁置</item>
+        <item>抛弃</item>
+    </string-array>
+    <string-array name="collection_status_real">
+        <item>想看</item>
+        <item>看过</item>
+        <item>在看</item>
+        <item>搁置</item>
+        <item>抛弃</item>
+    </string-array>
+    <string name="episode_status_watch">看过</string>
+    <string name="episode_status_watch_to">看到</string>
+    <string name="episode_status_wish">想看</string>
+    <string name="episode_status_drop">抛弃</string>
+    <string name="episode_status_remove">未看</string>
+    <string-array name="episode_status">
+        <item>@string/episode_status_watch</item>
+        <item>@string/episode_status_watch_to</item>
+        <item>@string/episode_status_wish</item>
+        <item>@string/episode_status_drop</item>
+        <item>@string/episode_status_remove</item>
+    </string-array>
     <string-array name="topic_list">
         <item>全部</item>
         <item>小组</item>
@@ -62,7 +59,6 @@
         <item>章节</item>
         <item>人物</item>
     </string-array>
-
     <string-array name="timeline_list">
         <item>全部</item>
         <item>吐槽</item>
@@ -77,29 +73,142 @@
         <item>天窗</item>
     </string-array>
 
-    <string-array name="collection_status">
-        <item>想看</item>
-        <item>看过</item>
-        <item>在看</item>
-        <item>搁置</item>
-        <item>抛弃</item>
-    </string-array>
-    <string-array name="episode_status">
-        <item>看过</item>
-        <item>看到</item>
-        <item>想看</item>
-        <item>抛弃</item>
-        <item>未看</item>
-    </string-array>
-    <string name="title_activity_settings">设置</string>
-    <string name="pref_miscellaneous">其他设置</string>
-    <string name="commend">相似推荐</string>
-    <string name="character_info">角色介绍</string>
-    <string name="subject">条目</string>
+    <string name="anime">动画</string>
+    <string name="anime_all">全部动画</string>
+    <string name="anime_tv">TV动画</string>
+    <string name="anime_web">WEB动画</string>
+    <string name="anime_ova">OVA动画</string>
+    <string name="anime_movie">剧场版动画</string>
+    <string name="anime_misc">其他动画</string>
+    <string name="book">书籍</string>
+    <string name="book_all">全部书籍</string>
+    <string name="book_comic">漫画</string>
+    <string name="book_novel">小说</string>
+    <string name="book_illustration">画集</string>
+    <string name="book_misc">其他书籍</string>
+    <string name="game">游戏</string>
+    <string name="game_all">全部游戏</string>
+    <string name="game_pc">PC游戏</string>
+    <string name="game_mac">Mac OS游戏</string>
+    <string name="game_ps4">PS4游戏</string>
+    <string name="game_xbox_one">Xbox One游戏</string>
+    <string name="game_ns">Nintendo Switch游戏</string>
+    <string name="game_wii_u">Wii U游戏</string>
+    <string name="game_ps3">PS3游戏</string>
+    <string name="game_xbox360">Xbox360游戏</string>
+    <string name="game_wii">Wii游戏</string>
+    <string name="game_psv">PS Vita游戏</string>
+    <string name="game_3ds">3DS游戏</string>
+    <string name="game_iphone">iOS游戏</string>
+    <string name="game_android">Android游戏</string>
+    <string name="game_arc">街机游戏</string>
+    <string name="game_nds">NDS游戏</string>
+    <string name="game_psp">PSP游戏</string>
+    <string name="game_ps2">PS2游戏</string>
+    <string name="game_xbox">XBOX游戏</string>
+    <string name="game_gamecube">GameCube游戏</string>
+    <string name="game_dreamcast">Dreamcast游戏</string>
+    <string name="game_n64">Nintendo 64游戏</string>
+    <string name="game_ps">PlayStation游戏</string>
+    <string name="game_sfc">SFC游戏</string>
+    <string name="game_fc">FC游戏</string>
+    <string name="game_ws">WonderSwan游戏</string>
+    <string name="game_wsc">WonderSwan Color游戏</string>
+    <string name="game_ngp">NEOGEO Pocket Color游戏</string>
+    <string name="game_gba">GBA游戏</string>
+    <string name="game_vb">Virtual Boy游戏</string>
+    <string name="music">音乐</string>
+    <string name="real">三次元</string>
+    <string name="real_all">全部剧集</string>
+    <string name="real_jp">日剧</string>
+    <string name="real_en">欧美剧</string>
+    <string name="real_cn">华语剧</string>
+
+    <string name="mono">人物</string>
+    <string name="mono_ctr">虚构角色</string>
+    <string name="mono_psn">现实人物</string>
+
+    <string name="episode_type_main">本篇</string>
+    <string name="episode_type_sp">特别篇</string>
+    <string name="episode_type_op">OP</string>
+    <string name="episode_type_ed">ED</string>
+    <string name="episode_type_pv">PV</string>
+    <string name="episode_type_mad">MAD</string>
+    <string name="episode_type_music">曲目</string>
+    <string name="episode_type_other">其他</string>
+
+    <string name="cancel">取消</string>
+    <string name="ok">确定</string>
+    <string name="submit">提交</string>
+    <string name="more">更多</string>
+    <string name="reply">回复</string>
+    <string name="delete">删除</string>
+    <string name="edit">编辑</string>
+    <string name="refresh">刷新</string>
+    <string name="collapse">收起</string>
+    <string name="expand">展开</string>
+    <string name="share">分享</string>
+    <string name="open_browser">在浏览器中打开</string>
+    <string name="login">登录</string>
+
+    <string name="download">下载</string>
+    <string name="ignore">忽略</string>
+
+    <string name="bold">粗体字</string>
+    <string name="italic">斜体字</string>
+    <string name="strike">删除线</string>
+    <string name="underline">下划线</string>
+    <string name="mask">马赛克</string>
+
     <string name="friend">好友</string>
-    <string name="all">全部</string>
+    <string name="all_site">全站</string>
     <string name="self">自己</string>
 
+    <!-- drawer -->
+    <string name="home">主页</string>
+    <string name="calendar">时间表</string>
+    <string name="index">索引</string>
+    <string name="cache">离线缓存</string>
+    <string name="search">搜索</string>
+    <string name="settings">设置</string>
+    <string name="night_mode">夜间模式</string>
+    <string name="logout">注销</string>
+
+    <string name="rakuen">超展开</string>
+    <string name="timeline">时间胶囊</string>
+
+    <!-- Crash -->
+    <string name="crash_upload_crash">上传崩溃日志</string>
+    <string name="crash_restart_app">重新启动应用</string>
+    <string name="crash_upload_ok">日志上传成功</string>
+    <string name="crash_upload_failed">日志上传失败 %1$s</string>
+
+    <!-- 搜索页 -->
+    <string name="search_hint">搜索…</string>
+    <string name="search_history">搜索历史</string>
+    <string name="search_history_clear">删除搜索历史</string>
+    <string name="search_hint_no_history">没有搜索的历史记录</string>
+    <string name="search_history_remove">删除搜索历史</string>
+
+    <!-- 条目页 -->
+    <string name="desc_cover">番剧海报</string>
+    <string name="subject_progress_edit">修改</string>
+    <string name="subject_linked">关联条目</string>
+    <string name="subject_commend">相似推荐</string>
+    <string name="subject_comment">吐槽</string>
+    <string name="subject_tag">标签</string>
+    <string name="subject_topics">讨论版</string>
+    <string name="subject_blog">评论</string>
+    <string name="character_info">角色介绍</string>
+
+    <string name="subject_dialog_update_progress">更新</string>
+    <string name="subject_dialog_add_tag">添加标签</string>
+    <string name="subject_dialog_remove_tag">删除标签</string>
+    <string name="subject_collection_private">仅自己可见</string>
+    <string name="subject_collection_remove">删除收藏</string>
+
+    <!-- 设置 -->
+    <string name="pref_miscellaneous">其他设置</string>
     <string-array name="pref_image_quality">
         <item>清晰</item>
         <item>普通</item>
@@ -112,4 +221,60 @@
         <item>m</item>
         <item>s</item>
     </string-array>
+
+    <!-- 回复对话框 -->
+    <string name="desc_emoji">表情</string>
+    <string name="desc_image">图片</string>
+    <string name="desc_format">字体</string>
+    <string name="desc_send">发送</string>
+
+    <!-- hint -->
+    <string name="hint_chased">已追番</string>
+    <string name="hint_collected">已收藏</string>
+    <string name="hint_empty">什么都没有哦</string>
+    <string name="hint_login">点击头像登录</string>
+    <string name="hint_reply">不吐槽一下吗</string>
+    <string name="hint_empty_topic">这里什么都没有哟</string>
+    <string name="hint_login_topic">登录后才可以评论哦</string>
+    <string name="hint_submit_error">提交出现了一些问题，请稍后再试</string>
+    <string name="hint_back_to_close">再按一次退出程序</string>
+    <string name="hint_no_play_source">暂无播放源</string>
+    <string name="navigation_drawer_open">导航开</string>
+    <string name="navigation_drawer_close">导航关</string>
+
+    <string name="search_dialog_history_clear">删除搜索历史?</string>
+    <string name="collection_dialog_remove">删除这个条目收藏?</string>
+    <string name="timeline_dialog_remove">删除这条时间线?</string>
+    <string name="reply_dialog_remove">删除这条回复?</string>
+    <string name="timeline_dialog_add">添加动态</string>
+
+    <string name="parse_new_version">新版本：%1$s</string>
+
+    <string name="ep_unit">话</string>
+    <string name="vol_unit">章</string>
+    <string name="phrase_progress">看到 %1$s</string>
+    <string name="parse_sort_ep">第 %1$s 话</string>
+    <string name="parse_sort_vol">第 %1$s 章</string>
+    <string name="parse_cache_eps">已缓存 %1$d 话</string>
+    <string name="parse_watch_to">看到%1$s</string>
+    <string name="hint_watch_nothing">尚未观看</string>
+    <string name="hint_air_nothing">尚未开播</string>
+    <string name="parse_update_to">更新到%1$s</string>
+    <string name="phrase_full_eps">全 %1$d 话</string>
+
+    <string name="phrase_air_date">首播：%1$s</string>
+    <string name="phrase_duration">时长：%1$s</string>
+    <string name="phrase_comment">讨论（+%1$d）</string>
+
+    <string name="rate_count">%1$d人</string>
+    <string name="phrase_reply">%1$d 回复</string>
+
+    <!-- 超展开 -->
+    <string name="parse_hint_reply_topic">回复 %1$s</string>
+    <string name="parse_hint_reply_post">回复 %1$s 的评论</string>
+    <string name="parse_hint_modify_topic">修改主题 %1$s</string>
+    <string name="parse_hint_modify_post">修改主题 %1$s 的回复</string>
+    <string name="notify_inbox">收件箱</string>
+    <string name="notify_notify">电波提醒</string>
+
 </resources>