diff --git a/res/layout/gallery_detail.xml b/res/layout/gallery_detail.xml
index 863678660..828977e29 100644
--- a/res/layout/gallery_detail.xml
+++ b/res/layout/gallery_detail.xml
@@ -134,7 +134,7 @@
                     android:drawablePadding="4dp"
                     android:gravity="center"
                     android:maxWidth="52dp"
-                    android:text="上传者更多内容"
+                    android:text="@string/more_of_uploader"
                     android:textSize="@dimen/text_little_small" />
 
                 <TextView
@@ -145,7 +145,7 @@
                     android:drawablePadding="4dp"
                     android:gravity="center"
                     android:maxWidth="52dp"
-                    android:text="相似内容"
+                    android:text="@string/similar_content"
                     android:textSize="@dimen/text_little_small" />
             </LinearLayout>
 
@@ -202,7 +202,7 @@
                     android:layout_below="@id/size"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="8dp"
-                    android:text="点击查看更多" />
+                    android:text="@string/click_more" />
             </RelativeLayout>
 
             <View
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2a46e90cc..773998adf 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,9 +16,6 @@
 -->
 <resources>
 
-    <string name="drawer_open">打开侧边栏</string>
-    <string name="drawer_close">关闭侧边栏</string>
-
     <!-- Warning -->
     <string name="dailog_waring_title">警告</string>
     <string name="dailog_waring_plain">该应用内容来自互联网，部分内容可能对您的生理及心理造成难以恢复的伤害。该应用作者不会对由该应用造成的后果负责。您是否愿意继续使用该应用？</string>
@@ -30,23 +27,12 @@
     <string name="dailog_analyics_plain">您是否愿意将使用情况发送给开发者？这对开发者维护该应用有很大帮助。在发送使用情况的同时也会发送部分设备信息（譬如设备型号、系统版本）。开发者承诺不收集任何个人身份信息数据（譬如姓名、电话号码、电邮地址）。\n\n数据收集过程采用 Google Analytics。\nGOOGLE ANALYTICS（分析）服务条款：http://www.google.com/analytics/terms/cn.html\nGoogle隐私权和条款：http://www.google.com/intl/zh-CN/policies\n\n您以后可以在设置中修改选择</string>
 
     <!-- Network -->
-    <string name="dailog_check_network">检查网络</string>
     <string name="dailog_network_error_yes">我不在意</string>
     <string name="dailog_network_error_no">成</string>
 
     <!-- Exit -->
     <string name="exit_tip">再按一次退出</string>
 
-    <!-- Login -->
-    <string name="check_login">检查登陆状态</string>
-    <string name="toast_login_succeeded">登陆成功</string>
-    <string name="toast_login_failed">登陆失败</string>
-    <string name="dialog_title_login_or_not">是否登陆</string>
-    <string name="dialog_messgae_login_or_not">登陆以后好处都有啥？</string>
-    <string name="not_login">不登陆</string>
-    <string name="toast_logout_succeeded">退出成功</string>
-    <string name="toast_logout_failed">退出失败</string>
-
     <!-- Mode -->
     <string name="content">内容</string>
 
@@ -63,8 +49,6 @@
     <string name="checkbox_sdt2">搜索差评标签</string>
     <string name="checkbox_sh">搜索被删除的本子</string>
     <string name="checkbox_sr">最低评分：</string>
-    <string name="toast_normal_mode">切换至普通搜索模式</string>
-    <string name="toast_tag_mode">切换至标签搜索模式</string>
 
     <!-- Jump -->
     <string name="jump_summary" formatted="false">第 %d 页，共 %s 页</string>
@@ -85,12 +69,13 @@
     <!-- GalleryListActivity -->
     <string name="no_found">未找到</string>
     <string name="none">无</string>
-    <string name="list_title" formatted="false">%s 第 %d 页</string>
     <string name="quick_search_tip">您可以再左侧栏搜索项中添加快速搜索</string>
+    <string name="no_avatar">无头像</string>
+    <string name="get_avatar_error">获取头像失败</string>
+    <string name="image_search">图像搜索</string>
 
     <!-- Update -->
     <string name="update_message" formatted="false">发现新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
-    <string name="tap_update">点击检查更新</string>
     <string name="checking_update">正在检查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">发现新版本</string>
@@ -99,29 +84,19 @@
     <string name="update_failed">下载更新失败</string>
 
     <!-- GalleryDetialActivity -->
-    <string name="detail_pages_size" formatted="false">页数 : %s (%s)</string>
-    <string name="detail_language">语言 : %s</string>
-    <string name="detail_average">平均得分：%s</string>
-    <string name="detail_people">投票人数：%s</string>
-    <string name="detail_offensive_title">内容警告</string>
-    <string name="detail_offensive">这个本子被所有人标记为瞎眼。所以任何人都不应该看。\n\n（如果你忽略了这个警告，你就失去了抱怨的权利。）</string>
-    <string name="detail_button_cancel">算了，不看了</string>
-    <string name="detail_button_once">就看这一次</string>
-    <string name="detail_button_every">别再烦我了</string>
-    <string name="detail_pining">This gallery is pining for the fjords.</string>
-    <string name="detail_button_known">我知道了</string>
-    <string name="detail_preview_error">获取预览失败</string>
-    <string name="detail_not_rated">暂无人投票</string>
-    <string name="vote_up">顶</string>
-    <string name="vote_down">踩</string>
-    <string name="show_tagged">相同标签</string>
+    <string name="we_feel">大家觉得 %s</string>
+    <string name="more_of_uploader">上传者更多内容</string>
+    <string name="no_more_comment">没有更多评论</string>
+    <string name="no_comment">暂无评论，就等你了</string>
 
-    <!-- GalleryActivity -->
-    <string name="load_pre">载入上一页</string>
-    <string name="first_page">已是第一页</string>
-    <string name="start_reloading">开始继续载入</string>
-    <string name="retry_max_pre">已达重试上限，滑至最左侧继续加载</string>
-    <string name="retry_max_next">已达重试上限，滑至最右侧继续加载</string>
+    <!-- AbsGalleryActivity -->
+    <string name="click_retry">点击重试</string>
+    <string name="click_first_page">点击回第一页</string>
+
+    <!-- Download -->
+    <string name="legacy_pages">%d 页未下载</string>
+    <string name="download_over">下载结束</string>
+    <string name="start_download">开始下载</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">网络错误</string>
@@ -151,6 +126,15 @@
     <string name="em_get_body_error">获取正文失败</string>
     <string name="em_invalid_request">无效的请求</string>
     <string name="em_no_sdcard">未挂载 SD卡</string>
+    <string name="em_index_error">索引错误</string>
+    <string name="em_requst_null">请求内容为空</string>
+
+    <!-- Gallery -->
+    <string name="gallery_tip">长按屏幕，可使下载从当前页面开始。若该项正在下载，则仅优先加载当前页面。</string>
+    <string name="read_image_error">读取图片错误</string>
+    <string name="not_loaded">尚未加载</string>
+    <string name="loading_percent">正在加载 %d%%</string>
+    <string name="wait_for_more">等待获取页面信息</string>
 
     <!-- Action -->
     <string name="action_refresh">刷新</string>
@@ -169,9 +153,9 @@
     <string name="delete_successfully">删除成功</string>
     <string name="failed_to_delete">删除失败</string>
     <string name="set_default_favorite">设为默认收藏夹</string>
+    <string name="favorite_warning">未检测到登陆状态，账号收藏可被他人修改。而且由于开发者水平问题，本地收藏不可靠。</string>
 
     <!-- Popular -->
-    <string name="popular_warning_message">该页面中的内容基于数据统计，您尚未开启数据统计。若开启数据统计，您的行为将对该页面产生影响。是否现在开启数据统计？</string>
     <string name="popular_update_time">更新时间 %s</string>
 
     <!-- Settings -->
@@ -207,13 +191,7 @@
     <string name="preview_mode_title">预览图模式</string>
     <string name="preview_mode_normal">正常预览图</string>
     <string name="preview_mode_large">大预览图</string>
-    <string name="preview_per_row_title">每行预览图数量</string>
     <string name="data_settings_title">数据</string>
-    <string name="cache_data_settings_title">缓存</string>
-    <string name="cache_size_title">缓存大小</string>
-    <string name="clear_cache_title">清除缓存</string>
-    <string name="clear_cache_summary_on" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="clear_cache_summary_off">无缓存</string>
     <string name="download_data_settings_title">下载</string>
     <string name="download_path_title">下载路径</string>
     <string name="media_scan_title">允许媒体扫描</string>
@@ -240,25 +218,9 @@
     <string name="allow_analyics_summary_off">感谢您使用本应用</string>
     <string name="about_analyics_title">关于数据统计</string>
     <string name="about_analyics_comment">若您启用了数据统计，本应用会将您的使用情况发送给开发者。这对开发者维护该应用有很大帮助。在发送使用情况的同时也会发送部分设备信息（譬如设备型号、系统版本）。开发者承诺不收集任何个人身份信息数据（譬如姓名、电话号码、电邮地址）。\n\n数据收集过程采用 Google Analytics。\nGOOGLE ANALYTICS（分析）服务条款：http://www.google.com/analytics/terms/cn.html\nGoogle隐私权和条款：http://www.google.com/intl/zh-CN/policies</string>
-    <string name="preference_category_display">显示</string>
-    <string name="preference_screen_ori">屏幕方向</string>
     <string name="portrait">竖屏</string>
     <string name="landscape">横屏</string>
-    <string name="preference_page_scaling">页面缩放</string>
-    <string name="preference_start_position">开页位置</string>
     <string name="preference_settings_title">设置</string>
-    <string name="preference_category_cache">缓存</string>
-    <string name="preference_cache_summary" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="preference_cache_summary_no">无缓存</string>
-    <string name="preference_auto_page_cache">自动清理页面缓存</string>
-    <string name="preference_auto_page_cache_summary_on">当应用关闭时清除页面缓存</string>
-    <string name="preference_auto_page_cache_summary_off">啥都不做</string>
-    <string name="preference_update_server">更新服务器</string>
-    <string name="preference_category_about">关于</string>
-    <string name="preference_author">作者</string>
-    <string name="cache_large">缓存太大了！</string>
-    <string name="input_error">输入错误</string>
-    <string name="create_cache_error">创建缓存错误</string>
     <string name="list_mode_detail">详情</string>
     <string name="list_mode_thumb">缩略图</string>
     <string name="new_folder">新建文件夹</string>
@@ -288,46 +250,19 @@
     <!-- server -->
     <string name="update_server_google">Google</string>
     <string name="update_server_qiniu">七牛</string>
-    <string name="update_server_gokuai">够快</string>
 
     <!-- Tag -->
     <string name="add_tag">添加标签</string>
     <string name="tag_name">标签名称：</string>
     <string name="tag_name_empty">标签名称不能为空</string>
-    <string name="tag_name_exist">标签名称已存在</string>
     <string name="tag_change_name">修改名称</string>
     <string name="new_tag_name">新名称：%s</string>
 
     <!-- Pull -->
-    <string name="pull_refresh_pull">下拉刷新…</string>
-    <string name="pull_refresh_release">释放刷新…</string>
-    <string name="pull_refresh_doing">正在刷新…</string>
-    <string name="pull_refresh_done">完成刷新</string>
-    <string name="pull_refresh_cancel">取消刷新</string>
-    <string name="pull_pre_pull">下拉读取上一页…</string>
-    <string name="pull_pre_release">释放读取上一页…</string>
-    <string name="pull_pre_doing">正在读取上一页…</string>
-    <string name="pull_pre_done">完成读取上一页</string>
-    <string name="pull_pre_cancel">取消读取上一页</string>
-    <string name="pull_load_pull">下拉加载…</string>
-    <string name="pull_load_release">释放加载…</string>
-    <string name="pull_load_doing">正在加载…</string>
-    <string name="pull_load_done">完成加载</string>
-    <string name="pull_load_cancel">取消加载</string>
     <string name="footer_loading">正在加载更多…</string>
     <string name="footer_loaded">已全部加载</string>
     <string name="footer_fail">加载失败，点击继续加载</string>
 
-    <!-- Download -->
-    <string name="start_download_task">开始下载任务</string>
-    <string name="download_task_finished">完成下载任务</string>
-    <string name="downloading">正在下载</string>
-    <string name="download_successfully">下载成功</string>
-    <string name="download_unsuccessfully">下载失败</string>
-    <string name="not_started">未启动</string>
-    <string name="waiting">等待中</string>
-    <string name="wait_for_last">等待上个操作结束</string>
-
     <!-- GalleryView -->
     <string name="pre_page">上一页</string>
     <string name="next_page">下一页</string>
@@ -335,18 +270,12 @@
     <string name="zoom_out">缩小</string>
     <string name="menu">菜单</string>
 
-    <!-- Mode Dialog -->
-    <string name="select_mode_warning">请登录以避免 Sad Panda</string>
-
-    <!-- Vote -->
-    <string name="vote_succeeded">投票成功</string>
-    <string name="vote_failed">投票失败</string>
-
     <!-- Rate -->
     <string name="invalid_rating">非法评分</string>
-    <string name="rate_succeeded">评价成功</string>
-    <string name="rate_failed">评价失败</string>
-    <string name="uploader_others">该用户上传的其他内容</string>
+    <string name="rate_succeeded">评分成功</string>
+    <string name="rate_sensibly">理智评分</string>
+    <string name="rate_failed">评分失败</string>
+    <string name="gallery_of_he">该用户上传的内容</string>
 
     <!-- rating -->
     <string name="rating10">根本把持不住</string>
@@ -361,7 +290,20 @@
     <string name="rating1">快要窒息了</string>
     <string name="rating0">…</string>
 
-    <!-- Util -->
+    <!-- Utils -->
+    <string name="click_more">点击查看更多</string>
+    <string name="similar_content">相似内容</string>
+    <string name="_unknown">未知</string>
+    <string name="language">语言</string>
+    <string name="pages">页面</string>
+    <string name="size">大小</string>
+    <string name="tip">提示</string>
+    <string name="not_started">未启动</string>
+    <string name="waiting">等待中</string>
+    <string name="done">已完成</string>
+    <string name="first_page">第一页</string>
+    <string name="the_last_page">最后一页</string>
+    <string name="downloading">正在下载</string>
     <string name="attention">注意</string>
     <string name="start">开始</string>
     <string name="stop">停止</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index dda1f9fe3..b4b1537ee 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      strings.xml generated with OpenCC -->
+<!--
+     strings.xml generated with OpenCC
+-->
 <resources>
 
-    <string name="drawer_open">打開側邊欄</string>
-    <string name="drawer_close">關閉側邊欄</string>
-
     <!-- Warning -->
     <string name="dailog_waring_title">警告</string>
     <string name="dailog_waring_plain">該應用內容來自互聯網，部分內容可能對您的生理及心理造成難以恢復的傷害。該應用作者不會對由該應用造成的後果負責。您是否願意繼續使用該應用？</string>
@@ -16,23 +15,12 @@
     <string name="dailog_analyics_plain">您是否願意將使用情況發送給開發者？這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設置中修改選擇</string>
 
     <!-- Network -->
-    <string name="dailog_check_network">檢查網絡</string>
     <string name="dailog_network_error_yes">我不在意</string>
     <string name="dailog_network_error_no">成</string>
 
     <!-- Exit -->
     <string name="exit_tip">再按一次退出</string>
 
-    <!-- Login -->
-    <string name="check_login">檢查登陸狀態</string>
-    <string name="toast_login_succeeded">登陸成功</string>
-    <string name="toast_login_failed">登陸失敗</string>
-    <string name="dialog_title_login_or_not">是否登陸</string>
-    <string name="dialog_messgae_login_or_not">登陸以後好處都有啥？</string>
-    <string name="not_login">不登陸</string>
-    <string name="toast_logout_succeeded">退出成功</string>
-    <string name="toast_logout_failed">退出失敗</string>
-
     <!-- Mode -->
     <string name="content">內容</string>
 
@@ -46,11 +34,9 @@
     <string name="checkbox_storr">搜索種子文件名</string>
     <string name="checkbox_sto">僅搜索有種子的本子</string>
     <string name="checkbox_sdt1">搜索 Low-Power 標籤</string>
-    <string name="checkbox_sdt2">搜索 Downvoted 標籤</string>
+    <string name="checkbox_sdt2">搜索差評標籤</string>
     <string name="checkbox_sh">搜索被刪除的本子</string>
     <string name="checkbox_sr">最低評分：</string>
-    <string name="toast_normal_mode">切換至普通搜索模式</string>
-    <string name="toast_tag_mode">切換至標籤搜索模式</string>
 
     <!-- Jump -->
     <string name="jump_summary" formatted="false">第 %d 頁，共 %s 頁</string>
@@ -68,14 +54,16 @@
     <string name="toast_add_favourite">已添加到收藏</string>
     <string name="toast_add_download">已添加到下載列表</string>
 
-    <!-- MangaListActivity -->
+    <!-- GalleryListActivity -->
     <string name="no_found">未找到</string>
     <string name="none">無</string>
-    <string name="list_title" formatted="false">%s 第 %d 頁</string>
+    <string name="quick_search_tip">您可以再左側欄搜索項中添加快速搜索</string>
+    <string name="no_avatar">無頭像</string>
+    <string name="get_avatar_error">獲取頭像失敗</string>
+    <string name="image_search">圖像搜索</string>
 
     <!-- Update -->
     <string name="update_message" formatted="false">發現新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
-    <string name="tap_update">點擊檢查更新</string>
     <string name="checking_update">正在檢查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">發現新版本</string>
@@ -83,30 +71,20 @@
     <string name="download_update">正在下載更新</string>
     <string name="update_failed">下載更新失敗</string>
 
-    <!-- MangaDetialActivity -->
-    <string name="detail_pages_size" formatted="false">頁數 : %s (%s)</string>
-    <string name="detail_language">語言 : %s</string>
-    <string name="detail_average">平均得分：%s</string>
-    <string name="detail_people">投票人數：%s</string>
-    <string name="detail_offensive_title">內容警告</string>
-    <string name="detail_offensive">這個本子被所有人標記爲瞎眼。所以任何人都不應該看。\n\n（如果你忽略了這個警告，你就失去了抱怨的權利。）</string>
-    <string name="detail_button_cancel">算了，不看了</string>
-    <string name="detail_button_once">就看這一次</string>
-    <string name="detail_button_every">別再煩我了</string>
-    <string name="detail_pining">This gallery is pining for the fjords.</string>
-    <string name="detail_button_known">我知道了</string>
-    <string name="detail_preview_error">獲取預覽失敗</string>
-    <string name="detail_not_rated">暫無人投票</string>
-    <string name="vote_up">頂</string>
-    <string name="vote_down">踩</string>
-    <string name="show_tagged">相同標籤</string>
+    <!-- GalleryDetialActivity -->
+    <string name="we_feel">大家覺得 %s</string>
+    <string name="more_of_uploader">上傳者更多內容</string>
+    <string name="no_more_comment">沒有更多評論</string>
+    <string name="no_comment">暫無評論，就等你了</string>
 
-    <!-- MangaActivity -->
-    <string name="load_pre">載入上一頁</string>
-    <string name="first_page">已是第一頁</string>
-    <string name="start_reloading">開始繼續載入</string>
-    <string name="retry_max_pre">已達重試上限，滑至最左側繼續加載</string>
-    <string name="retry_max_next">已達重試上限，滑至最右側繼續加載</string>
+    <!-- AbsGalleryActivity -->
+    <string name="click_retry">點擊重試</string>
+    <string name="click_first_page">點擊回第一頁</string>
+
+    <!-- Download -->
+    <string name="legacy_pages">%d 頁未下載</string>
+    <string name="download_over">下載結束</string>
+    <string name="start_download">開始下載</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">網絡錯誤</string>
@@ -136,6 +114,15 @@
     <string name="em_get_body_error">獲取正文失敗</string>
     <string name="em_invalid_request">無效的請求</string>
     <string name="em_no_sdcard">未掛載 SD卡</string>
+    <string name="em_index_error">索引錯誤</string>
+    <string name="em_requst_null">請求內容爲空</string>
+
+    <!-- Gallery -->
+    <string name="gallery_tip">長按屏幕，可使下載從當前頁面開始。若該項正在下載，則僅優先加載當前頁面。</string>
+    <string name="read_image_error">讀取圖片錯誤</string>
+    <string name="not_loaded">尚未加載</string>
+    <string name="loading_percent">正在加載 %d%%</string>
+    <string name="wait_for_more">等待獲取頁面信息</string>
 
     <!-- Action -->
     <string name="action_refresh">刷新</string>
@@ -154,9 +141,9 @@
     <string name="delete_successfully">刪除成功</string>
     <string name="failed_to_delete">刪除失敗</string>
     <string name="set_default_favorite">設爲默認收藏夾</string>
+    <string name="favorite_warning">未檢測到登陸狀態，賬號收藏可被他人修改。而且由於開發者水平問題，本地收藏不可靠。</string>
 
     <!-- Popular -->
-    <string name="popular_warning_message">該頁面中的內容基於數據統計，您尚未開啓數據統計。若開啓數據統計，您的行爲將對該頁面產生影響。是否現在開啓數據統計？</string>
     <string name="popular_update_time">更新時間 %s</string>
 
     <!-- Settings -->
@@ -173,6 +160,11 @@
     <string name="start_position_title">開頁位置</string>
     <string name="list_display_settings_title">列表</string>
     <string name="list_mode_title">列表模式</string>
+    
+    <string name="list_thumb_columns">列表縮略圖列數</string>
+    <string name="preview_display_settings_title">預覽</string>
+    <string name="preview_columns">預覽圖列數</string>
+    
     <string name="popular_display_settings_title">熱門</string>
     <string name="show_popular_update_time_title">顯示熱門更新時間</string>
     <string name="eh_settings_title">EH</string>
@@ -187,13 +179,7 @@
     <string name="preview_mode_title">預覽圖模式</string>
     <string name="preview_mode_normal">正常預覽圖</string>
     <string name="preview_mode_large">大預覽圖</string>
-    <string name="preview_per_row_title">每行預覽圖數量</string>
     <string name="data_settings_title">數據</string>
-    <string name="cache_data_settings_title">緩存</string>
-    <string name="cache_size_title">緩存大小</string>
-    <string name="clear_cache_title">清除緩存</string>
-    <string name="clear_cache_summary_on" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="clear_cache_summary_off">無緩存</string>
     <string name="download_data_settings_title">下載</string>
     <string name="download_path_title">下載路徑</string>
     <string name="media_scan_title">允許媒體掃描</string>
@@ -220,25 +206,9 @@
     <string name="allow_analyics_summary_off">感謝您使用本應用</string>
     <string name="about_analyics_title">關於數據統計</string>
     <string name="about_analyics_comment">若您啓用了數據統計，本應用會將您的使用情況發送給開發者。這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
-    <string name="preference_category_display">顯示</string>
-    <string name="preference_screen_ori">屏幕方向</string>
     <string name="portrait">豎屏</string>
     <string name="landscape">橫屏</string>
-    <string name="preference_page_scaling">頁面縮放</string>
-    <string name="preference_start_position">開頁位置</string>
     <string name="preference_settings_title">設置</string>
-    <string name="preference_category_cache">緩存</string>
-    <string name="preference_cache_summary" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="preference_cache_summary_no">無緩存</string>
-    <string name="preference_auto_page_cache">自動清理頁面緩存</string>
-    <string name="preference_auto_page_cache_summary_on">當應用關閉時清除頁面緩存</string>
-    <string name="preference_auto_page_cache_summary_off">啥都不做</string>
-    <string name="preference_update_server">更新服務器</string>
-    <string name="preference_category_about">關於</string>
-    <string name="preference_author">作者</string>
-    <string name="cache_large">緩存太大了！</string>
-    <string name="input_error">輸入錯誤</string>
-    <string name="create_cache_error">創建緩存錯誤</string>
     <string name="list_mode_detail">詳情</string>
     <string name="list_mode_thumb">縮略圖</string>
     <string name="new_folder">新建文件夾</string>
@@ -268,46 +238,19 @@
     <!-- server -->
     <string name="update_server_google">Google</string>
     <string name="update_server_qiniu">七牛</string>
-    <string name="update_server_gokuai">夠快</string>
 
     <!-- Tag -->
     <string name="add_tag">添加標籤</string>
     <string name="tag_name">標簽名稱：</string>
     <string name="tag_name_empty">標簽名稱不能爲空</string>
-    <string name="tag_name_exist">標簽名稱已存在</string>
     <string name="tag_change_name">修改名稱</string>
     <string name="new_tag_name">新名稱：%s</string>
 
     <!-- Pull -->
-    <string name="pull_refresh_pull">下拉刷新…</string>
-    <string name="pull_refresh_release">釋放刷新…</string>
-    <string name="pull_refresh_doing">正在刷新…</string>
-    <string name="pull_refresh_done">完成刷新</string>
-    <string name="pull_refresh_cancel">取消刷新</string>
-    <string name="pull_pre_pull">下拉讀取上一頁…</string>
-    <string name="pull_pre_release">釋放讀取上一頁…</string>
-    <string name="pull_pre_doing">正在讀取上一頁…</string>
-    <string name="pull_pre_done">完成讀取上一頁</string>
-    <string name="pull_pre_cancel">取消讀取上一頁</string>
-    <string name="pull_load_pull">下拉加載…</string>
-    <string name="pull_load_release">釋放加載…</string>
-    <string name="pull_load_doing">正在加載…</string>
-    <string name="pull_load_done">完成加載</string>
-    <string name="pull_load_cancel">取消加載</string>
     <string name="footer_loading">正在加載更多…</string>
     <string name="footer_loaded">已全部加載</string>
     <string name="footer_fail">加載失敗，點擊繼續加載</string>
 
-    <!-- Download -->
-    <string name="start_download_task">開始下載任務</string>
-    <string name="download_task_finished">完成下載任務</string>
-    <string name="downloading">正在下載</string>
-    <string name="download_successfully">下載成功</string>
-    <string name="download_unsuccessfully">下載失敗</string>
-    <string name="not_started">未啓動</string>
-    <string name="waiting">等待中</string>
-    <string name="wait_for_last">等待上個操作結束</string>
-
     <!-- GalleryView -->
     <string name="pre_page">上一頁</string>
     <string name="next_page">下一頁</string>
@@ -315,18 +258,12 @@
     <string name="zoom_out">縮小</string>
     <string name="menu">菜單</string>
 
-    <!-- Mode Dialog -->
-    <string name="select_mode_warning">請登錄以避免 Sad Panda</string>
-
-    <!-- Vote -->
-    <string name="vote_succeeded">投票成功</string>
-    <string name="vote_failed">投票失敗</string>
-
     <!-- Rate -->
     <string name="invalid_rating">非法評分</string>
-    <string name="rate_succeeded">評價成功</string>
-    <string name="rate_failed">評價失敗</string>
-    <string name="uploader_others">該用戶上傳的其他內容</string>
+    <string name="rate_succeeded">評分成功</string>
+    <string name="rate_sensibly">理智評分</string>
+    <string name="rate_failed">評分失敗</string>
+    <string name="gallery_of_he">該用戶上傳的內容</string>
 
     <!-- rating -->
     <string name="rating10">根本把持不住</string>
@@ -338,10 +275,26 @@
     <string name="rating4">不行</string>
     <string name="rating3">糟糕</string>
     <string name="rating2">瞎眼</string>
-    <string name="rating1">以頭搶地</string>
-    <string name="rating0">感覺快要窒息了</string>
+    <string name="rating1">快要窒息了</string>
+    <string name="rating0">…</string>
 
-    <!-- Util -->
+    <!-- Utils -->
+    <string name="click_more">點擊查看更多</string>
+    <string name="similar_content">相似內容</string>
+    <string name="_unknown">未知</string>
+    <string name="language">語言</string>
+    <string name="pages">頁面</string>
+    <string name="size">大小</string>
+    <string name="tip">提示</string>
+    <string name="not_started">未啓動</string>
+    <string name="waiting">等待中</string>
+    <string name="done">已完成</string>
+    <string name="first_page">第一頁</string>
+    <string name="the_last_page">最後一頁</string>
+    <string name="downloading">正在下載</string>
+    <string name="attention">注意</string>
+    <string name="start">開始</string>
+    <string name="stop">停止</string>
     <string name="invalid_input">無效的輸入</string>
     <string name="never_show">不再顯示</string>
     <string name="retry">重試</string>
@@ -373,6 +326,7 @@
     <string name="some_page">第 %d 頁</string>
     <string name="_default">默認</string>
     <string name="delete">刪除</string>
+    <string name="delete2">刪除（包括圖片）</string>
     <string name="move">移動</string>
     <string name="list">列表</string>
     <string name="homepage">首頁</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7e0d10589..be3ba8f55 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      strings.xml generated with OpenCC -->
+<!--
+     strings.xml generated with OpenCC
+-->
 <resources>
 
-    <string name="drawer_open">開啟側邊欄</string>
-    <string name="drawer_close">關閉側邊欄</string>
-
     <!-- Warning -->
     <string name="dailog_waring_title">警告</string>
     <string name="dailog_waring_plain">該應用內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。該應用作者不會對由該應用造成的後果負責。您是否願意繼續使用該應用？</string>
@@ -16,23 +15,12 @@
     <string name="dailog_analyics_plain">您是否願意將使用情況發送給開發者？這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設定中修改選擇</string>
 
     <!-- Network -->
-    <string name="dailog_check_network">檢查網路</string>
     <string name="dailog_network_error_yes">我不在意</string>
     <string name="dailog_network_error_no">成</string>
 
     <!-- Exit -->
     <string name="exit_tip">再按一次退出</string>
 
-    <!-- Login -->
-    <string name="check_login">檢查登陸狀態</string>
-    <string name="toast_login_succeeded">登陸成功</string>
-    <string name="toast_login_failed">登陸失敗</string>
-    <string name="dialog_title_login_or_not">是否登陸</string>
-    <string name="dialog_messgae_login_or_not">登陸以後好處都有啥？</string>
-    <string name="not_login">不登陸</string>
-    <string name="toast_logout_succeeded">退出成功</string>
-    <string name="toast_logout_failed">退出失敗</string>
-
     <!-- Mode -->
     <string name="content">內容</string>
 
@@ -46,11 +34,9 @@
     <string name="checkbox_storr">搜索種子檔名</string>
     <string name="checkbox_sto">僅搜索有種子的本子</string>
     <string name="checkbox_sdt1">搜索 Low-Power 標籤</string>
-    <string name="checkbox_sdt2">搜索 Downvoted 標籤</string>
+    <string name="checkbox_sdt2">搜索差評標籤</string>
     <string name="checkbox_sh">搜索被刪除的本子</string>
     <string name="checkbox_sr">最低評分：</string>
-    <string name="toast_normal_mode">切換至普通搜索模式</string>
-    <string name="toast_tag_mode">切換至標籤搜索模式</string>
 
     <!-- Jump -->
     <string name="jump_summary" formatted="false">第 %d 頁，共 %s 頁</string>
@@ -68,14 +54,16 @@
     <string name="toast_add_favourite">已添加到收藏</string>
     <string name="toast_add_download">已添加到下載列表</string>
 
-    <!-- MangaListActivity -->
+    <!-- GalleryListActivity -->
     <string name="no_found">未找到</string>
     <string name="none">無</string>
-    <string name="list_title" formatted="false">%s 第 %d 頁</string>
+    <string name="quick_search_tip">您可以再左側欄搜索項中添加快速搜索</string>
+    <string name="no_avatar">無頭像</string>
+    <string name="get_avatar_error">獲取頭像失敗</string>
+    <string name="image_search">影象搜索</string>
 
     <!-- Update -->
     <string name="update_message" formatted="false">發現新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
-    <string name="tap_update">點選檢查更新</string>
     <string name="checking_update">正在檢查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">發現新版本</string>
@@ -83,30 +71,20 @@
     <string name="download_update">正在下載更新</string>
     <string name="update_failed">下載更新失敗</string>
 
-    <!-- MangaDetialActivity -->
-    <string name="detail_pages_size" formatted="false">頁數 : %s (%s)</string>
-    <string name="detail_language">語言 : %s</string>
-    <string name="detail_average">平均得分：%s</string>
-    <string name="detail_people">投票人數：%s</string>
-    <string name="detail_offensive_title">內容警告</string>
-    <string name="detail_offensive">這個本子被所有人標記為瞎眼。所以任何人都不應該看。\n\n（如果你忽略了這個警告，你就失去了抱怨的權利。）</string>
-    <string name="detail_button_cancel">算了，不看了</string>
-    <string name="detail_button_once">就看這一次</string>
-    <string name="detail_button_every">別再煩我了</string>
-    <string name="detail_pining">This gallery is pining for the fjords.</string>
-    <string name="detail_button_known">我知道了</string>
-    <string name="detail_preview_error">獲取預覽失敗</string>
-    <string name="detail_not_rated">暫無人投票</string>
-    <string name="vote_up">頂</string>
-    <string name="vote_down">踩</string>
-    <string name="show_tagged">相同標籤</string>
+    <!-- GalleryDetialActivity -->
+    <string name="we_feel">大家覺得 %s</string>
+    <string name="more_of_uploader">上傳者更多內容</string>
+    <string name="no_more_comment">沒有更多評論</string>
+    <string name="no_comment">暫無評論，就等你了</string>
 
-    <!-- MangaActivity -->
-    <string name="load_pre">載入上一頁</string>
-    <string name="first_page">已是第一頁</string>
-    <string name="start_reloading">開始繼續載入</string>
-    <string name="retry_max_pre">已達重試上限，滑至最左側繼續載入</string>
-    <string name="retry_max_next">已達重試上限，滑至最右側繼續載入</string>
+    <!-- AbsGalleryActivity -->
+    <string name="click_retry">點選重試</string>
+    <string name="click_first_page">點選回第一頁</string>
+
+    <!-- Download -->
+    <string name="legacy_pages">%d 頁未下載</string>
+    <string name="download_over">下載結束</string>
+    <string name="start_download">開始下載</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">網路錯誤</string>
@@ -136,6 +114,15 @@
     <string name="em_get_body_error">獲取正文失敗</string>
     <string name="em_invalid_request">無效的請求</string>
     <string name="em_no_sdcard">未掛載 SD卡</string>
+    <string name="em_index_error">索引錯誤</string>
+    <string name="em_requst_null">請求內容為空</string>
+
+    <!-- Gallery -->
+    <string name="gallery_tip">長按螢幕，可使下載從當前頁面開始。若該項正在下載，則僅優先載入當前頁面。</string>
+    <string name="read_image_error">讀取圖片錯誤</string>
+    <string name="not_loaded">尚未載入</string>
+    <string name="loading_percent">正在載入 %d%%</string>
+    <string name="wait_for_more">等待獲取頁面資訊</string>
 
     <!-- Action -->
     <string name="action_refresh">重新整理</string>
@@ -154,9 +141,9 @@
     <string name="delete_successfully">刪除成功</string>
     <string name="failed_to_delete">刪除失敗</string>
     <string name="set_default_favorite">設為默認收藏夾</string>
+    <string name="favorite_warning">未檢測到登陸狀態，賬號收藏可被他人修改。而且由於開發者水平問題，本地收藏不可靠。</string>
 
     <!-- Popular -->
-    <string name="popular_warning_message">該頁面中的內容基於資料統計，您尚未開啟資料統計。若開啟資料統計，您的行為將對該頁面產生影響。是否現在開啟資料統計？</string>
     <string name="popular_update_time">更新時間 %s</string>
 
     <!-- Settings -->
@@ -173,6 +160,11 @@
     <string name="start_position_title">開頁位置</string>
     <string name="list_display_settings_title">列表</string>
     <string name="list_mode_title">列表模式</string>
+    
+    <string name="list_thumb_columns">列表縮圖列數</string>
+    <string name="preview_display_settings_title">預覽</string>
+    <string name="preview_columns">預覽圖列數</string>
+    
     <string name="popular_display_settings_title">熱門</string>
     <string name="show_popular_update_time_title">顯示熱門更新時間</string>
     <string name="eh_settings_title">EH</string>
@@ -187,13 +179,7 @@
     <string name="preview_mode_title">預覽圖模式</string>
     <string name="preview_mode_normal">正常預覽圖</string>
     <string name="preview_mode_large">大預覽圖</string>
-    <string name="preview_per_row_title">每行預覽圖數量</string>
     <string name="data_settings_title">資料</string>
-    <string name="cache_data_settings_title">快取</string>
-    <string name="cache_size_title">快取大小</string>
-    <string name="clear_cache_title">清除快取</string>
-    <string name="clear_cache_summary_on" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="clear_cache_summary_off">無快取</string>
     <string name="download_data_settings_title">下載</string>
     <string name="download_path_title">下載路徑</string>
     <string name="media_scan_title">允許媒體掃描</string>
@@ -220,25 +206,9 @@
     <string name="allow_analyics_summary_off">感謝您使用本應用</string>
     <string name="about_analyics_title">關於資料統計</string>
     <string name="about_analyics_comment">若您啟用了資料統計，本應用會將您的使用情況發送給開發者。這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
-    <string name="preference_category_display">顯示</string>
-    <string name="preference_screen_ori">螢幕方向</string>
     <string name="portrait">豎屏</string>
     <string name="landscape">橫屏</string>
-    <string name="preference_page_scaling">頁面縮放</string>
-    <string name="preference_start_position">開頁位置</string>
     <string name="preference_settings_title">設定</string>
-    <string name="preference_category_cache">快取</string>
-    <string name="preference_cache_summary" formatted="false">大小 : %.2f / %d MB</string>
-    <string name="preference_cache_summary_no">無快取</string>
-    <string name="preference_auto_page_cache">自動清理頁面快取</string>
-    <string name="preference_auto_page_cache_summary_on">當應用關閉時清除頁面快取</string>
-    <string name="preference_auto_page_cache_summary_off">啥都不做</string>
-    <string name="preference_update_server">更新伺服器</string>
-    <string name="preference_category_about">關於</string>
-    <string name="preference_author">作者</string>
-    <string name="cache_large">快取太大了！</string>
-    <string name="input_error">輸入錯誤</string>
-    <string name="create_cache_error">創建快取錯誤</string>
     <string name="list_mode_detail">詳情</string>
     <string name="list_mode_thumb">縮圖</string>
     <string name="new_folder">新建資料夾</string>
@@ -268,46 +238,19 @@
     <!-- server -->
     <string name="update_server_google">Google</string>
     <string name="update_server_qiniu">七牛</string>
-    <string name="update_server_gokuai">夠快</string>
 
     <!-- Tag -->
     <string name="add_tag">添加標籤</string>
     <string name="tag_name">標簽名稱：</string>
     <string name="tag_name_empty">標簽名稱不能為空</string>
-    <string name="tag_name_exist">標簽名稱已存在</string>
     <string name="tag_change_name">修改名稱</string>
     <string name="new_tag_name">新名稱：%s</string>
 
     <!-- Pull -->
-    <string name="pull_refresh_pull">下拉重新整理…</string>
-    <string name="pull_refresh_release">釋放重新整理…</string>
-    <string name="pull_refresh_doing">正在重新整理…</string>
-    <string name="pull_refresh_done">完成重新整理</string>
-    <string name="pull_refresh_cancel">取消重新整理</string>
-    <string name="pull_pre_pull">下拉讀取上一頁…</string>
-    <string name="pull_pre_release">釋放讀取上一頁…</string>
-    <string name="pull_pre_doing">正在讀取上一頁…</string>
-    <string name="pull_pre_done">完成讀取上一頁</string>
-    <string name="pull_pre_cancel">取消讀取上一頁</string>
-    <string name="pull_load_pull">下拉載入…</string>
-    <string name="pull_load_release">釋放載入…</string>
-    <string name="pull_load_doing">正在載入…</string>
-    <string name="pull_load_done">完成載入</string>
-    <string name="pull_load_cancel">取消載入</string>
     <string name="footer_loading">正在載入更多…</string>
     <string name="footer_loaded">已全部載入</string>
     <string name="footer_fail">載入失敗，點選繼續載入</string>
 
-    <!-- Download -->
-    <string name="start_download_task">開始下載任務</string>
-    <string name="download_task_finished">完成下載任務</string>
-    <string name="downloading">正在下載</string>
-    <string name="download_successfully">下載成功</string>
-    <string name="download_unsuccessfully">下載失敗</string>
-    <string name="not_started">未啟動</string>
-    <string name="waiting">等待中</string>
-    <string name="wait_for_last">等待上個操作結束</string>
-
     <!-- GalleryView -->
     <string name="pre_page">上一頁</string>
     <string name="next_page">下一頁</string>
@@ -315,18 +258,12 @@
     <string name="zoom_out">縮小</string>
     <string name="menu">選單</string>
 
-    <!-- Mode Dialog -->
-    <string name="select_mode_warning">請登入以避免 Sad Panda</string>
-
-    <!-- Vote -->
-    <string name="vote_succeeded">投票成功</string>
-    <string name="vote_failed">投票失敗</string>
-
     <!-- Rate -->
     <string name="invalid_rating">非法評分</string>
-    <string name="rate_succeeded">評價成功</string>
-    <string name="rate_failed">評價失敗</string>
-    <string name="uploader_others">該使用者上傳的其他內容</string>
+    <string name="rate_succeeded">評分成功</string>
+    <string name="rate_sensibly">理智評分</string>
+    <string name="rate_failed">評分失敗</string>
+    <string name="gallery_of_he">該使用者上傳的內容</string>
 
     <!-- rating -->
     <string name="rating10">根本把持不住</string>
@@ -338,10 +275,26 @@
     <string name="rating4">不行</string>
     <string name="rating3">糟糕</string>
     <string name="rating2">瞎眼</string>
-    <string name="rating1">以頭搶地</string>
-    <string name="rating0">感覺快要窒息了</string>
+    <string name="rating1">快要窒息了</string>
+    <string name="rating0">…</string>
 
-    <!-- Util -->
+    <!-- Utils -->
+    <string name="click_more">點選檢視更多</string>
+    <string name="similar_content">相似內容</string>
+    <string name="_unknown">未知</string>
+    <string name="language">語言</string>
+    <string name="pages">頁面</string>
+    <string name="size">大小</string>
+    <string name="tip">提示</string>
+    <string name="not_started">未啟動</string>
+    <string name="waiting">等待中</string>
+    <string name="done">已完成</string>
+    <string name="first_page">第一頁</string>
+    <string name="the_last_page">最後一頁</string>
+    <string name="downloading">正在下載</string>
+    <string name="attention">注意</string>
+    <string name="start">開始</string>
+    <string name="stop">停止</string>
     <string name="invalid_input">無效的輸入</string>
     <string name="never_show">不再顯示</string>
     <string name="retry">重試</string>
@@ -373,6 +326,7 @@
     <string name="some_page">第 %d 頁</string>
     <string name="_default">默認</string>
     <string name="delete">刪除</string>
+    <string name="delete2">刪除（包括圖片）</string>
     <string name="move">移動</string>
     <string name="list">列表</string>
     <string name="homepage">首頁</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b7f4c169a..1fb1bfc79 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -41,7 +41,7 @@
 
     <string-array name="comment_long_click">
         <item>@android:string/copy</item>
-        <item>@string/uploader_others</item>
+        <item>@string/gallery_of_he</item>
     </string-array>
 
     <string-array name="page_scaling_entries">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a77a1c8db..346e484cb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,8 +17,6 @@
 <resources>
 
     <string name="app_name" translatable="false">EhViewer</string>
-    <string name="drawer_open">Open navigation drawer</string>
-    <string name="drawer_close">Close navigation drawer</string>
 
     <!-- Warning -->
     <string name="dailog_waring_title">Waring</string>
@@ -31,24 +29,12 @@
     <string name="dailog_analyics_plain">您是否愿意将使用情况发送给开发者？这对开发者维护该应用有很大帮助。在发送使用情况的同时也会发送部分设备信息（譬如设备型号、系统版本）。开发者承诺不收集任何个人身份信息数据（譬如姓名、电话号码、电邮地址）。\n\n数据收集过程采用 Google Analytics。\nGOOGLE ANALYTICS（分析）服务条款：http://www.google.com/analytics/terms/us.html\nGoogle隐私权和条款：http://www.google.com/intl/us/policies\n\n您以后可以在设置中修改选择</string>
 
     <!-- Network -->
-    <string name="dailog_check_network">Checking network</string>
     <string name="dailog_network_error_yes">I don\'t care</string>
     <string name="dailog_network_error_no">Fine</string>
-    <string name="dialog_wait_send_crash_msg">Please close the dialog after sending logcat</string>
 
     <!-- Exit -->
     <string name="exit_tip">Click again to exit</string>
 
-    <!-- Login -->
-    <string name="check_login">Checking login status</string>
-    <string name="toast_login_succeeded">Login succeedfully</string>
-    <string name="toast_login_failed">Failed to login</string>
-    <string name="dialog_title_login_or_not">Login or not</string>
-    <string name="dialog_messgae_login_or_not">What are the benefits of login ?</string>
-    <string name="not_login">Do not login</string>
-    <string name="toast_logout_succeeded">Logout succeedfully</string>
-    <string name="toast_logout_failed">Failed to logout</string>
-
     <!-- Mode -->
     <string name="content">Content</string>
     <string name="api" translatable="false">API</string>
@@ -66,8 +52,6 @@
     <string name="checkbox_sdt2">Search Downvoted Tags</string>
     <string name="checkbox_sh">Show Expunged Galleries</string>
     <string name="checkbox_sr">Minimum Rating:</string>
-    <string name="toast_normal_mode">Switch To Normal Search Mode</string>
-    <string name="toast_tag_mode">Switch To Tag Search Mode</string>
 
     <!-- Jump -->
     <string name="jump_summary" formatted="false">Page %d, %s pages in total</string>
@@ -79,6 +63,7 @@
     <string name="dialog_send_crash_plain">This application crashed last time. Would you mind to send logcat to the developer for a better user experience in future ?</string>
     <string name="dialog_send_crash_yes">Never mind</string>
     <string name="dialog_send_crash_no">Yes, I would</string>
+    <string name="dialog_wait_send_crash_msg">Please close the dialog after sending logcat</string>
 
     <!-- List item long click -->
     <string name="toast_add_favourite">Add to favourite</string>
@@ -87,12 +72,13 @@
     <!-- GalleryListActivity -->
     <string name="no_found">No hits found</string>
     <string name="none">None</string>
-    <string name="list_title" formatted="false">%s Page %d</string>
     <string name="quick_search_tip">Quick search can be added via search in left drawer</string>
+    <string name="no_avatar">No avatar</string>
+    <string name="get_avatar_error">Get avatar error</string>
+    <string name="image_search">Image search</string>
 
     <!-- Update -->
     <string name="update_message" formatted="false">Found new version : %s\nSize : %s\n%s\n\nUpdate ?</string>
-    <string name="tap_update">Tap to check update</string>
     <string name="checking_update">checking updating</string>
     <string name="up_to_date">Up to date</string>
     <string name="found_update">Found update</string>
@@ -101,27 +87,19 @@
     <string name="update_failed">Download the update Failed</string>
 
     <!-- GalleryDetialActivity -->
-    <string name="detail_pages_size" formatted="false">Pages : %s (%s)</string>
-    <string name="detail_language">Language : %s</string>
-    <string name="detail_offensive_title">Content Warning</string>
-    <string name="detail_offensive">This gallery has been flagged as Offensive For Everyone. Due to its content, it should not be viewed by anyone.\n\n(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)</string>
-    <string name="detail_button_cancel">I would not read it</string>
-    <string name="detail_button_once">Just this time</string>
-    <string name="detail_button_every">Do not trouble me</string>
-    <string name="detail_pining">This gallery is pining for the fjords.</string>
-    <string name="detail_button_known">Yes, I know</string>
-    <string name="detail_preview_error">Get preview error !</string>
-    <string name="detail_not_rated">Not yet rated</string>
-    <string name="vote_up">Vote up</string>
-    <string name="vote_down">Vote down</string>
-    <string name="show_tagged">Show tagged</string>
+    <string name="we_feel">We fell %s</string>
+    <string name="more_of_uploader">More of uploader</string>
+    <string name="no_more_comment">No more comments</string>
+    <string name="no_comment">No comment</string>
 
-    <!-- GalleryActivity -->
-    <string name="load_pre">Load previous page</string>
-    <string name="first_page">First page !</string>
-    <string name="start_reloading">Start reloading</string>
-    <string name="retry_max_pre">Reached retry limit, scroll to leftmost side to reload</string>
-    <string name="retry_max_next">Reached retry limit, scroll to rightmost side to reload</string>
+    <!-- AbsGalleryActivity -->
+    <string name="click_retry">Click to retry</string>
+    <string name="click_first_page">Click to go to first page</string>
+
+    <!-- Download -->
+    <string name="legacy_pages">%d pages leaved</string>
+    <string name="download_over">Download over</string>
+    <string name="start_download">Start downloading</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">Network Error</string>
@@ -151,6 +129,15 @@
     <string name="em_get_body_error">Get body error</string>
     <string name="em_invalid_request">Invalid request</string>
     <string name="em_no_sdcard">SD card is Unmounted</string>
+    <string name="em_index_error">Index error</string>
+    <string name="em_requst_null">Requst content is null</string>
+
+    <!-- Gallery -->
+    <string name="gallery_tip">Long press the screen to download from the current page. If the item is being downloaded, just load current page first.</string>
+    <string name="read_image_error">Read image error</string>
+    <string name="not_loaded">Not loader</string>
+    <string name="loading_percent">Loading %d%%</string>
+    <string name="wait_for_more">Waiting to get page information</string>
 
     <!-- Action -->
     <string name="action_refresh">Refresh</string>
@@ -169,9 +156,9 @@
     <string name="delete_successfully">Delete successfully</string>
     <string name="failed_to_delete">Failed to delete</string>
     <string name="set_default_favorite">Set it as default favorite</string>
+    <string name="favorite_warning">Not logged in, account favorite can be modified by someone else. And due to the developer, local favorite is unreliable.</string>
 
     <!-- Popular -->
-    <string name="popular_warning_message">该页面中的内容基于数据统计，您尚未开启数据统计。若开启了数据统计，您的行为将对该页面产生影响。是否现在开启数据统计？</string>
     <string name="popular_update_time">Update at %s</string>
 
     <!-- Settings -->
@@ -207,13 +194,7 @@
     <string name="preview_mode_title">Preview mode</string>
     <string name="preview_mode_normal">Normal</string>
     <string name="preview_mode_large">Large</string>
-    <string name="preview_per_row_title">Preview number per row</string>
     <string name="data_settings_title">Data</string>
-    <string name="cache_data_settings_title">Cache</string>
-    <string name="cache_size_title">Cache size</string>
-    <string name="clear_cache_title">Clear cache</string>
-    <string name="clear_cache_summary_on" formatted="false">Size : %.2f / %d MB</string>
-    <string name="clear_cache_summary_off">No cache</string>
     <string name="download_data_settings_title">Download</string>
     <string name="download_path_title">Download path</string>
     <string name="media_scan_title">Allow media scan</string>
@@ -246,12 +227,6 @@
     <string name="portrait">Portrait</string>
     <string name="landscape">Landscape</string>
     <string name="preference_settings_title">Settings</string>
-    <string name="preference_auto_page_cache">Auto clear page cache</string>
-    <string name="preference_auto_page_cache_summary_on">Clean page cache when the application close</string>
-    <string name="preference_auto_page_cache_summary_off">Leave page cache alone</string>
-    <string name="cache_large">Cache size is too larger !</string>
-    <string name="input_error">Input error</string>
-    <string name="create_cache_error">Create cache error</string>
     <string name="list_mode_detail">Detail</string>
     <string name="list_mode_thumb">Thumb</string>
     <string name="new_folder">New folder</string>
@@ -282,45 +257,20 @@
     <!-- server -->
     <string name="update_server_google">Google</string>
     <string name="update_server_qiniu">Qiniu</string>
-    <string name="update_server_gokuai">Gokuai</string>
 
     <!-- Tag -->
     <string name="add_tag">Add tag</string>
     <string name="tag_name">Tag name : </string>
     <string name="tag_name_empty">Tag name can\'t be empty</string>
-    <string name="tag_name_exist">Tag name already existed</string>
     <string name="tag_change_name">Change name</string>
     <string name="new_tag_name">New name : %s</string>
 
     <!-- Pull -->
-    <string name="pull_refresh_pull">Pull to refresh…</string>
-    <string name="pull_refresh_release">Release to refresh…</string>
-    <string name="pull_refresh_doing">Refreshing…</string>
-    <string name="pull_refresh_done">Refreshed</string>
-    <string name="pull_refresh_cancel">Cancel refresh</string>
-    <string name="pull_pre_pull">Pull to load previous page…</string>
-    <string name="pull_pre_release">Release to load previous page…</string>
-    <string name="pull_pre_doing">Loading previous page…</string>
-    <string name="pull_pre_done">Loaded previous page…</string>
-    <string name="pull_pre_cancel">Cancel previous page…</string>
-    <string name="pull_load_pull">Pull to load…</string>
-    <string name="pull_load_release">Release to load…</string>
-    <string name="pull_load_doing">Loading…</string>
-    <string name="pull_load_done">Loaded</string>
-    <string name="pull_load_cancel">Cancel load</string>
     <string name="footer_loading">Loading more…</string>
     <string name="footer_loaded">All loaded</string>
     <string name="footer_fail">Load fail，click to reload</string>
 
     <!-- Download -->
-    <string name="start_download_task">Start download task</string>
-    <string name="download_task_finished">Download task finished</string>
-    <string name="downloading">Downloading</string>
-    <string name="download_successfully">Download successfully</string>
-    <string name="download_unsuccessfully">Failed to download</string>
-    <string name="not_started">Not started</string>
-    <string name="waiting">Waiting</string>
-    <string name="wait_for_last">Please wait for the last operation</string>
 
     <!-- GalleryView -->
     <string name="pre_page">Previous page</string>
@@ -329,18 +279,12 @@
     <string name="zoom_out">Zoom out</string>
     <string name="menu">Menu</string>
 
-    <!-- Mode Dialog -->
-    <string name="select_mode_warning">Please login to avoid Sad Panda.</string>
-
-    <!-- Vote -->
-    <string name="vote_succeeded">Vote successfully</string>
-    <string name="vote_failed">Failed to vote</string>
-
     <!-- Rate -->
     <string name="invalid_rating">Invalid rating</string>
     <string name="rate_succeeded">Rate successfully</string>
+    <string name="rate_sensibly">Rate sensibly</string>
     <string name="rate_failed">Failed to rate</string>
-    <string name="uploader_others">该用户上传的其他内容</string>
+    <string name="gallery_of_he">Galleries of this guy</string>
 
     <!-- Category -->
     <string name="doujinshi" translatable="false">DOUJINSHI</string>
@@ -369,6 +313,22 @@
     <string name="rating0">DISASTER</string>
 
     <!-- Util -->
+    <string name="click_more">Click for more</string>
+    <string name="similar_content">Similar content</string>
+    <string name="_unknown">Unknown</string>
+    <string name="language">Language</string>
+    <string name="pages">Pages</string>
+    <string name="size">Size</string>
+    <string name="tip">Tip</string>
+    <string name="not_started">Not started</string>
+    <string name="waiting">Waiting</string>
+    <string name="done">Done</string>
+    <string name="first_page">First page</string>
+    <string name="the_last_page">The last page</string>
+    <string name="downloading">Downloading</string>
+    <string name="attention">Attention</string>
+    <string name="start">Start</string>
+    <string name="stop">Stop</string>
     <string name="invalid_input">Invalid Input</string>
     <string name="never_show">Never show me this dialog</string>
     <string name="retry">Retry</string>
@@ -377,6 +337,7 @@
     <string name="copyed">Copyed</string>
     <string name="send">Send</string>
     <string name="detail">Detail</string>
+    <string name="delete2">Detail (images included)</string>
     <string name="comment">Comment</string>
     <string name="info">Info</string>
     <string name="reply">Reply</string>
diff --git a/src/com/hippo/ehviewer/data/Data.java b/src/com/hippo/ehviewer/data/Data.java
index 0f30c9b8b..332b4ea49 100644
--- a/src/com/hippo/ehviewer/data/Data.java
+++ b/src/com/hippo/ehviewer/data/Data.java
@@ -184,9 +184,6 @@ public class Data {
             reference++;
         }
         else {
-
-            Log.e(TAG, "isInsert");
-
             isInsert = true;
             reference = 1;
         }
@@ -204,7 +201,6 @@ public class Data {
 
         if (isInsert) { // Set
             long id = mDatabase.insert(TABLE_GALLERY, null, values);
-            Log.e(TAG, "id = " + id);
         } else { // Update
             mDatabase.update(TABLE_GALLERY, values, COLUMN_GID + "=?", new String[]{String.valueOf(gid)});
         }
diff --git a/src/com/hippo/ehviewer/ehclient/EhClient.java b/src/com/hippo/ehviewer/ehclient/EhClient.java
index 9ef297d62..116fe3dfa 100644
--- a/src/com/hippo/ehviewer/ehclient/EhClient.java
+++ b/src/com/hippo/ehviewer/ehclient/EhClient.java
@@ -28,6 +28,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Process;
@@ -76,24 +77,24 @@ public class EhClient {
     public static final int GET_AVATAR_ERROR = 0x1;
     public static final int NO_AVATAR = 0x2;
 
-    private final AppContext mAppContext;
+    private final Context mContext;
     private final Handler mHandler;
     private final EhInfo mInfo;
 
     private static EhClient sInstance;
 
-    public static void createInstance(AppContext appContext) {
-        sInstance = new EhClient(appContext);
+    public static void createInstance(Context context) {
+        sInstance = new EhClient(context);
     }
 
     public static EhClient getInstance() {
         return sInstance;
     }
 
-    private EhClient(AppContext appContext) {
-        mAppContext = appContext;
+    private EhClient(Context context) {
+        mContext = context;
         mHandler = AppHandler.getInstance();
-        mInfo = EhInfo.getInstance(appContext);
+        mInfo = EhInfo.getInstance(context);
     }
 
     public static String getUrlHeader() {
@@ -305,7 +306,7 @@ public class EhClient {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                final HttpHelper hh = new HttpHelper(mAppContext);
+                final HttpHelper hh = new HttpHelper(mContext);
                 String body = hh.postForm(LOGIN_URL, new String[][] {
                         new String[] { "UserName", username },
                         new String[] { "PassWord", password },
@@ -342,7 +343,7 @@ public class EhClient {
                 Pattern p;
                 Matcher m;
                 // Get user profile url
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 body = hp.get(FORUMS_URL);
                 if (body == null) {
                     listener.onGetAvatar(GET_AVATAR_ERROR);
@@ -436,7 +437,7 @@ public class EhClient {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 String body = hp.get(url);
                 GetGListResponder responder;
                 if (body == null) {
@@ -456,11 +457,12 @@ public class EhClient {
                         break;
                     case ListParser.INDEX_ERROR:
                         responder = new GetGListResponder(listener, checkFlag,
-                                "index error"); // TODO
+                                mContext.getString(R.string.em_index_error));
                         break;
                     case ListParser.PARSER_ERROR:
                     default:
-                        responder = new GetGListResponder(listener, checkFlag, "parser error"); // TODO
+                        responder = new GetGListResponder(listener, checkFlag,
+                                mContext.getString(R.string.em_parser_error));
                         break;
                     }
                 }
@@ -550,12 +552,12 @@ public class EhClient {
             final int searchMode, final int apiMode, final Object checkFlag,
             final OnGetGListFromImageSearchListener listener) {
         if (file == null && bitmap == null)
-            listener.onFailure(checkFlag, "All null"); // TODO
+            listener.onFailure(checkFlag, mContext.getString(R.string.invalid_input));
 
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hh = new HttpHelper(mAppContext);
+                HttpHelper hh = new HttpHelper(mContext);
 
                 List<HttpHelper.FormData> dataList = new LinkedList<HttpHelper.FormData>();
                 HttpHelper.FormData data;
@@ -615,11 +617,12 @@ public class EhClient {
                             break;
                         case ListParser.INDEX_ERROR:
                             responder = new GetGListFromImageSearchResponder(listener, checkFlag,
-                                    "index error"); // TODO
+                                    mContext.getString(R.string.em_index_error));
                             break;
                         case ListParser.PARSER_ERROR:
                         default:
-                            responder = new GetGListFromImageSearchResponder(listener, checkFlag, "parser error"); // TODO
+                            responder = new GetGListFromImageSearchResponder(listener, checkFlag,
+                                    mContext.getString(R.string.em_parser_error));
                             break;
                         }
                     }
@@ -671,7 +674,7 @@ public class EhClient {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hh = new HttpHelper(mAppContext);
+                HttpHelper hh = new HttpHelper(mContext);
                 String body = hh.get(url);
                 GetGDetaiResponder responder;
                 if (body == null) {
@@ -718,7 +721,7 @@ public class EhClient {
                         responder = new GetGDetaiResponder(listener, parser.eMesg);
                     } else {
                         responder = new GetGDetaiResponder(listener,
-                                mAppContext.getString(R.string.em_parser_error));
+                                mContext.getString(R.string.em_parser_error));
                     }
                 }
                 mHandler.post(responder);
@@ -771,7 +774,7 @@ public class EhClient {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hh = new HttpHelper(mAppContext);
+                HttpHelper hh = new HttpHelper(mContext);
                 String body = hh.get(url);
                 GetLGDetaiResponder responder;
                 if (body == null) {
@@ -786,7 +789,7 @@ public class EhClient {
                         responder = new GetLGDetaiResponder(listener, lgd, parser.isLastPage);
                     } else {
                         responder = new GetLGDetaiResponder(listener,
-                                mAppContext.getString(R.string.em_parser_error));
+                                mContext.getString(R.string.em_parser_error));
                     }
                 }
                 mHandler.post(responder);
@@ -845,7 +848,7 @@ public class EhClient {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hh = new HttpHelper(mAppContext);
+                HttpHelper hh = new HttpHelper(mContext);
                 String body = hh.get(url);
                 GetPreviewListResponder responder;
                 if (body != null) {
@@ -884,7 +887,7 @@ public class EhClient {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
@@ -894,13 +897,13 @@ public class EhClient {
                                 DetailParser.COMMENT) {
                             listener.onSuccess(parser.comments);
                         } else {
-                            listener.onFailure("parser error");   // TODO
+                            listener.onFailure( mContext.getString(R.string.em_parser_error));
                         }
                     }
 
                     @Override
                     public void onFailure(String eMsg) {
-                        listener.onFailure(eMsg);   // TODO
+                        listener.onFailure(eMsg);
                     }
                 });
                 hp.postForm(detailUrl, new String[][]{
@@ -910,8 +913,6 @@ public class EhClient {
         }).start();
     }
 
-    // TODO
-
     /********** Use E-hentai API ************/
 
     // rate for gallery
@@ -938,7 +939,7 @@ public class EhClient {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
@@ -947,7 +948,7 @@ public class EhClient {
                         if (parser.parser(body)) {
                             listener.onSuccess(parser.mRatingAvg, parser.mRatingCnt);
                         } else {
-                            listener.onFailure("parser error");   // TODO
+                            listener.onFailure(mContext.getString(R.string.em_parser_error));
                         }
                     }
                     @Override
@@ -989,7 +990,7 @@ public class EhClient {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
@@ -998,7 +999,7 @@ public class EhClient {
                         if (parser.parser(body)) {
                             listener.onSuccess(parser.mTagPane);
                         } else {
-                            listener.onFailure("parser error");   // TODO
+                            listener.onFailure( mContext.getString(R.string.em_parser_error));
                         }
                     }
                     @Override
@@ -1051,7 +1052,7 @@ public class EhClient {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
@@ -1060,9 +1061,9 @@ public class EhClient {
                         if (parser.parser(body)) {
                             listener.onSuccess();
                             // Analytics
-                            Analytics.addToFavoriteGallery(mAppContext, gid, token);
+                            Analytics.addToFavoriteGallery(mContext, gid, token);
                         } else {
-                            listener.onFailure("parser error");   // TODO
+                            listener.onFailure( mContext.getString(R.string.em_parser_error));
                         }
                     }
                     @Override
@@ -1176,7 +1177,7 @@ public class EhClient {
             public void run() {
                 int i;
 
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
@@ -1188,7 +1189,7 @@ public class EhClient {
                         } else if (re == ListParser.NOT_FOUND) {
                             listener.onSuccess(parser.giList, parser.pageNum);
                         } else if (re == ListParser.PARSER_ERROR) {
-                            listener.onFailure("parser error"); // TODO
+                            listener.onFailure( mContext.getString(R.string.em_parser_error));
                         }
                     }
                     @Override
@@ -1232,7 +1233,7 @@ public class EhClient {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                HttpHelper hp = new HttpHelper(mAppContext);
+                HttpHelper hp = new HttpHelper(mContext);
                 hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
                     @Override
                     public void onSuccess(Object obj) {
diff --git a/src/com/hippo/ehviewer/gallery/GalleryView.java b/src/com/hippo/ehviewer/gallery/GalleryView.java
index b5bc99d6b..09778076e 100644
--- a/src/com/hippo/ehviewer/gallery/GalleryView.java
+++ b/src/com/hippo/ehviewer/gallery/GalleryView.java
@@ -292,7 +292,8 @@ public class GalleryView extends GLView
                 showItems[targetIndex].recycle();
 
             if (res == null) {
-                showItems[targetIndex] = new Text("读取图片错误"); // TODO
+                showItems[targetIndex] = new Text(
+                        mContext.getString(R.string.read_image_error));
             } else {
                 if (res instanceof Bitmap) {
                     BitmapImage bi = new BitmapImage();
@@ -641,13 +642,16 @@ public class GalleryView extends GLView
             if (state == ImageSet.RESULT_DECODE) {
                 showItems[targetIndex] = null;
             } else if (state == ImageSet.RESULT_DOWNLOADING) {
-                showItems[targetIndex] = new Text("正在下载"); // TODO
+                showItems[targetIndex] = new Text(
+                        mContext.getString(R.string.downloading));
             } else if (state == ImageSet.RESULT_NONE) {
-                showItems[targetIndex] = new Text("尚未加载"); // TODO
+                showItems[targetIndex] = new Text(
+                        mContext.getString(R.string.not_loaded));
             }
         } else if (obj instanceof Float) {
             showItems[targetIndex] = new Text(
-                    String.format("正在加载 %d%%", Math.round((Float)obj * 100)));
+                    String.format(mContext.getString(R.string.loading_percent),
+                            Math.round((Float)obj * 100)));
         }
 
         resetSizePosition(targetIndex);
@@ -1029,7 +1033,7 @@ public class GalleryView extends GLView
                 resetSizePosition(PRE_TARGET_INDEX);
                 if (!goToPrePage()) {
                     // Get to first page
-                    MaterialToast.showToast("第一页"); // TODO
+                    MaterialToast.showToast(mContext.getString(R.string.first_page));
                 }
             } else if (Utils.isInArea(topArea, (int)x, (int)y)) {
                 zoom(true);
@@ -1038,7 +1042,8 @@ public class GalleryView extends GLView
                 resetSizePosition(NEXT_TARGET_INDEX);
                 if (!goToNextPage()) {
                     // Get to last page
-                    MaterialToast.showToast(isEnsureSize ? "最后一页" : "等待获取后续页面"); // TODO
+                    MaterialToast.showToast(
+                            mContext.getString(isEnsureSize ? R.string.the_last_page : R.string.wait_for_more));
                 }
             } else if (Utils.isInArea(bottomArea, (int)x, (int)y)) {
                 zoom(false);
@@ -1220,9 +1225,10 @@ public class GalleryView extends GLView
                 ShowItem showItem = showItems[CUR_TARGET_INDEX];
                 if (showItem != null) {
                     if (isFirstPage() && showItem.mRect.left >= 0)
-                        MaterialToast.showToast("第一页");
+                        MaterialToast.showToast(mContext.getString(R.string.first_page));
                     else if (isLastPage() && showItem.mRect.right <= mScreenWidth)
-                        MaterialToast.showToast(isEnsureSize ? "最后一页" : "等待获取后续页面"); // TODO
+                        MaterialToast.showToast(
+                                mContext.getString(isEnsureSize ? R.string.the_last_page : R.string.wait_for_more));
                 }
             }
             return true;
diff --git a/src/com/hippo/ehviewer/network/HttpHelper.java b/src/com/hippo/ehviewer/network/HttpHelper.java
index d07411f8d..4dd8b5f9a 100644
--- a/src/com/hippo/ehviewer/network/HttpHelper.java
+++ b/src/com/hippo/ehviewer/network/HttpHelper.java
@@ -173,7 +173,7 @@ public class HttpHelper {
             return SAD_PANDA_ERROR;
 
         else if (e instanceof GetBodyException)
-            return "Null"; // TODO
+            return c.getString(R.string.em_requst_null);
 
         else
             return e.getClass().getSimpleName() + ": " +e.getMessage();
diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java
index f7dfbc1eb..0dcbda33e 100644
--- a/src/com/hippo/ehviewer/service/DownloadService.java
+++ b/src/com/hippo/ehviewer/service/DownloadService.java
@@ -191,7 +191,7 @@ public class DownloadService extends Service
 
         Notification.Builder builder = new Notification.Builder(mContext);
         setNotification(builder);
-        builder.setContentTitle("开始下载 " + gid)
+        builder.setContentTitle(getString(R.string.start_download)  + " " + gid)
                 .setContentText(null)
                 .setProgress(0, 0, true).setOngoing(true).setAutoCancel(false);
         mNotifyManager.notify(DOWNLOAD_NOTIFY_ID, builder.getNotification());
@@ -209,7 +209,7 @@ public class DownloadService extends Service
         mCurDownloadInfo.total = totalSize;
         Notification.Builder builder = new Notification.Builder(mContext);
         setNotification(builder);
-        builder.setContentTitle("正在下载 " + gid)
+        builder.setContentTitle(getString(R.string.downloading)  + " " + gid)
                 .setContentText(mSpeedStr)
                 .setProgress(totalSize, downloadSize, false).setOngoing(true).setAutoCancel(false);
         mNotifyManager.notify(DOWNLOAD_NOTIFY_ID, builder.getNotification());
@@ -226,7 +226,7 @@ public class DownloadService extends Service
         mSpeedStr = Utils.sizeToString(speed) + "/S";
         Notification.Builder builder = new Notification.Builder(mContext);
         setNotification(builder);
-        builder.setContentTitle("正在下载 " + gid)
+        builder.setContentTitle(getString(R.string.downloading)  + " " + gid)
                 .setContentText(mSpeedStr)
                 .setProgress(mCurDownloadInfo.total, mCurDownloadInfo.download,
                         mCurDownloadInfo.total == -1 ? true :false)
@@ -244,8 +244,9 @@ public class DownloadService extends Service
         mCurDownloadInfo.legacy = legacy;
         Notification.Builder builder = new Notification.Builder(mContext);
         setNotification(builder);
-        builder.setContentTitle("完成下载 " + gid)
-                .setContentText(legacy == 0 ? "已完成" : legacy + " 页未下载")
+        builder.setContentTitle(getString(R.string.download_over)  + " " + gid)
+                .setContentText(legacy == 0 ? getString(R.string.done) :
+                    String.format(getString(R.string.legacy_pages), legacy))
                 .setOngoing(false).setAutoCancel(true);
         mNotifyManager.notify(gid, builder.getNotification());
         mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID);
diff --git a/src/com/hippo/ehviewer/ui/AbsGalleryActivity.java b/src/com/hippo/ehviewer/ui/AbsGalleryActivity.java
index 55cd5c789..11c00b8f5 100644
--- a/src/com/hippo/ehviewer/ui/AbsGalleryActivity.java
+++ b/src/com/hippo/ehviewer/ui/AbsGalleryActivity.java
@@ -19,6 +19,7 @@ package com.hippo.ehviewer.ui;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -28,7 +29,6 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 
-import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.cache.ImageCache;
 import com.hippo.ehviewer.data.GalleryInfo;
@@ -49,7 +49,7 @@ public abstract class AbsGalleryActivity extends AbsSlidingActivity
     private static final int MODE_PRE_PAGE = 0x2;
     private static final int MODE_SOMEWHERE = 0x3;
 
-    protected AppContext mAppContext;
+    protected Context mContext;
     protected EhClient mClient;
 
     private List<GalleryInfo> mGiList;
@@ -249,7 +249,7 @@ public abstract class AbsGalleryActivity extends AbsSlidingActivity
         super.onCreate(savedInstanceState);
         setContentView(getLayoutRes());
 
-        mAppContext = (AppContext)getApplication();
+        mContext = getApplication();
         mClient = EhClient.getInstance();
 
         mGiList = new ArrayList<GalleryInfo>();
@@ -274,7 +274,8 @@ public abstract class AbsGalleryActivity extends AbsSlidingActivity
         mContentView.setSelector(new ColorDrawable(Color.TRANSPARENT));
         mContentView.setClipToPadding(false);
 
-        mRefreshTextView.setDefaultRefresh("点击重试", new RefreshTextView.OnRefreshListener() { // TODO
+        mRefreshTextView.setDefaultRefresh(R.string.click_retry,
+                new RefreshTextView.OnRefreshListener() {
             @Override
             public void onRefresh() {
                 retry();
@@ -350,10 +351,10 @@ public abstract class AbsGalleryActivity extends AbsSlidingActivity
         public void onScrollStateChanged(AbsListView view, int scrollState) {
             switch (scrollState) {
             case AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL:
-                ImageCache.getInstance(mAppContext).setPauseDiskCache(true);
+                ImageCache.getInstance(mContext).setPauseDiskCache(true);
                 break;
             case AbsListView.OnScrollListener.SCROLL_STATE_IDLE:
-                ImageCache.getInstance(mAppContext).setPauseDiskCache(false);
+                ImageCache.getInstance(mContext).setPauseDiskCache(false);
                 break;
             }
         }
@@ -470,8 +471,8 @@ public abstract class AbsGalleryActivity extends AbsSlidingActivity
             case MODE_SOMEWHERE:
                 mPullViewGroup.setVisibility(View.GONE);
                 mRefreshTextView.setVisibility(View.VISIBLE);
-                if (eMsg.equals("index error")) {
-                    mRefreshTextView.setEmesg(eMsg, "点击回第一页", // TODO
+                if (eMsg.equals(mContext.getString(R.string.em_index_error))) {
+                    mRefreshTextView.setEmesg(eMsg, mContext.getString(R.string.click_first_page),
                             new RefreshTextView.OnRefreshListener() {
                         @Override
                         public void onRefresh() {
diff --git a/src/com/hippo/ehviewer/ui/DownloadActivity.java b/src/com/hippo/ehviewer/ui/DownloadActivity.java
index 98a61c687..d1d3343ce 100644
--- a/src/com/hippo/ehviewer/ui/DownloadActivity.java
+++ b/src/com/hippo/ehviewer/ui/DownloadActivity.java
@@ -149,7 +149,6 @@ public class DownloadActivity extends AbsActivity implements AbsListView.OnItemC
             return position;
         }
 
-        // TODO chinese string
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             final DownloadInfo di = mDownloads.get(position);
@@ -225,7 +224,7 @@ public class DownloadActivity extends AbsActivity implements AbsListView.OnItemC
             switch (di.state) {
             case DownloadInfo.STATE_NONE:
                 pb.setVisibility(View.INVISIBLE);
-                leftText.setText("未启动");
+                leftText.setText(R.string.not_started);
                 rightText.setVisibility(View.GONE);
 
                 action.setText(getString(R.string.start));
@@ -234,7 +233,7 @@ public class DownloadActivity extends AbsActivity implements AbsListView.OnItemC
 
             case DownloadInfo.STATE_WAIT:
                 pb.setVisibility(View.INVISIBLE);
-                leftText.setText("等待中");
+                leftText.setText(R.string.waiting);
                 rightText.setVisibility(View.GONE);
 
                 action.setText(getString(R.string.stop));
@@ -263,9 +262,9 @@ public class DownloadActivity extends AbsActivity implements AbsListView.OnItemC
             case DownloadInfo.STATE_FINISH:
                 pb.setVisibility(View.INVISIBLE);
                 if (di.legacy == 0)
-                    leftText.setText("已完成");
+                    leftText.setText(R.string.done);
                 else
-                    leftText.setText(di.legacy + " 页未下载");
+                    leftText.setText(String.format(getApplication().getString(R.string.legacy_pages), di.legacy));
                 rightText.setVisibility(View.GONE);
 
                 action.setText(getString(R.string.start));
diff --git a/src/com/hippo/ehviewer/ui/FavouriteActivity.java b/src/com/hippo/ehviewer/ui/FavouriteActivity.java
index eae612411..2f0c02db3 100644
--- a/src/com/hippo/ehviewer/ui/FavouriteActivity.java
+++ b/src/com/hippo/ehviewer/ui/FavouriteActivity.java
@@ -50,7 +50,6 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.ImageLoader;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.cardview.CardViewSalon;
@@ -146,7 +145,7 @@ public class FavouriteActivity extends AbsGalleryActivity
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mAppContext = (AppContext)getApplication();
+        mContext = getApplication();
         mData = Data.getInstance();
         mResources =getResources();
         mClient = EhClient.getInstance();
@@ -276,7 +275,7 @@ public class FavouriteActivity extends AbsGalleryActivity
 
         // Check login
         if (!mClient.isLogin()) {
-            MaterialToast.showToast("未检测到登陆状态，仅可使用本地收藏。由于开发者的问题，本地收藏不可靠，请尽快登陆，将本地收藏转移至账户中的收藏。");// TODO
+            MaterialToast.showToast(R.string.favorite_warning);
         }
 
         // TODO Should show default favourite
diff --git a/src/com/hippo/ehviewer/ui/GalleryActivity.java b/src/com/hippo/ehviewer/ui/GalleryActivity.java
index f6dcac08f..845fd6691 100644
--- a/src/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -231,8 +231,8 @@ public class GalleryActivity extends AbsActivity
             // Show first tip
             if (Config.getGalleryFirst()) {
                 Config.setGalleryFirst(false);
-                new DialogBuilder(this).setTitle("提示")
-                        .setMessage("长按屏幕，可使下载从当前页面开始。若该项正在下载，则仅优先加载当前页面。") // TODO
+                new DialogBuilder(this).setTitle(R.string.tip)
+                        .setMessage(R.string.gallery_tip)
                         .setSimpleNegativeButton().create().show();
             }
         }
diff --git a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
index b8476b090..b3efaf8d7 100644
--- a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
@@ -517,8 +517,8 @@ public class GalleryDetailActivity extends AbsActivity
     }
 
     private String getAllRatingText(float rating, int people) {
-        StringBuilder sb = new StringBuilder().append("大家觉得").append(" ") // TODO
-                .append(getRatingText(rating))
+        StringBuilder sb = new StringBuilder()
+                .append(String.format(getString(R.string.we_feel), getRatingText(rating)))
                 .append(" (").append(rating);
         if (people != -1)
             sb.append(", ").append(people).append(")").toString();
@@ -627,10 +627,13 @@ public class GalleryDetailActivity extends AbsActivity
         mDetailMore.setVisibility(View.VISIBLE);
         if (mGalleryInfo instanceof GalleryDetail) {
             GalleryDetail galleryDetail = (GalleryDetail)mGalleryInfo;
-            ((TextView)mDetailMore.findViewById(R.id.language)).setText("语言: " + galleryDetail.language); // TODO
+            ((TextView)mDetailMore.findViewById(R.id.language)).setText(
+                    getString(R.string.language) + ": " + galleryDetail.language);
             ((TextView)mDetailMore.findViewById(R.id.posted)).setText(galleryDetail.posted);
-            ((TextView)mDetailMore.findViewById(R.id.pages)).setText("页面: " + String.valueOf(galleryDetail.pages));
-            ((TextView)mDetailMore.findViewById(R.id.size)).setText("大小: " + galleryDetail.size);
+            ((TextView)mDetailMore.findViewById(R.id.pages)).setText(
+                    getString(R.string.pages) + ": " + String.valueOf(galleryDetail.pages));
+            ((TextView)mDetailMore.findViewById(R.id.size)).setText(
+                    getString(R.string.size) + ": " + galleryDetail.size);
             StringBuilder sb = new StringBuilder();
             sb.append("gid: ").append(galleryDetail.gid).append("\n\n")
                     .append("token: ").append(galleryDetail.token).append("\n\n")
@@ -704,11 +707,11 @@ public class GalleryDetailActivity extends AbsActivity
 
             int commentNum = galleryDetail.comments.size();
             if (commentNum == 0)
-                mCommentMoreText.setText("暂无评论，就等你了");
+                mCommentMoreText.setText(R.string.no_comment);
             else if (commentNum <= 2)
-                mCommentMoreText.setText("没有更多评论");
+                mCommentMoreText.setText(R.string.no_more_comment);
             else
-                mCommentMoreText.setText("点击查看更多");
+                mCommentMoreText.setText(R.string.click_more);
             int maxShown = Math.min(2, commentNum);
             for (int i = 0; i < maxShown; i++) {
                 mDetailComment.addView(getCommentView(null, galleryDetail.comments.get(i), true),
@@ -866,14 +869,14 @@ public class GalleryDetailActivity extends AbsActivity
                     }
                     @Override
                     public void onFailure(String eMsg) {
-                        mRatingText.setText("评分失败"); // TODO
+                        mRatingText.setText(getString(R.string.rate_failed));
                         MaterialToast.showToast(eMsg);
                     }
                 });
-                mRatingText.setText("感谢评分"); // TODO
+                mRatingText.setText(getString(R.string.rate_succeeded));
                 mRating.setEnableRate(false);
             } else {
-                mRatingText.setText("请理智评分"); // TODO
+                mRatingText.setText(getString(R.string.rate_sensibly));
                 mRating.setEnableRate(true);
             }
 
diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
index a8a63c54d..2a21a3f07 100644
--- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
@@ -233,11 +233,11 @@ public class GalleryListActivity extends AbsGalleryActivity
                                             setUserPanel();
                                             break;
                                         case EhClient.NO_AVATAR:
-                                            MaterialToast.showToast("无头像"); // TODO
+                                            MaterialToast.showToast(R.string.no_avatar);
                                             break;
                                         case EhClient.GET_AVATAR_ERROR:
                                         default:
-                                            MaterialToast.showToast("获取头像失败"); // TODO
+                                            MaterialToast.showToast(R.string.get_avatar_error);
                                             break;
                                         }
                                     }
@@ -383,7 +383,7 @@ public class GalleryListActivity extends AbsGalleryActivity
                         String search = lus.getSearch();
                         switch(lus.getMode()) {
                         case ListUrls.MODE_IMAGE_SEARCH:
-                            mTitle = "图片搜索"; // TODO
+                            mTitle = getString(R.string.image_search);
                             break;
                         case ListUrls.MODE_UPLOADER:
                             mTitle = search;
@@ -565,7 +565,7 @@ public class GalleryListActivity extends AbsGalleryActivity
         TextView tv = (TextView)view.findViewById(R.id.list_jump_sum);
         // For lofi, can not get page num, so use Integer.MAX_VALUE
         tv.setText(String.format(getString(R.string.jump_summary), getCurPage() + 1,
-                getPageNum() == Integer.MAX_VALUE ? "未知" : String.valueOf(getPageNum()))); // TODO
+                getPageNum() == Integer.MAX_VALUE ? getString(R.string._unknown) : String.valueOf(getPageNum())));
         tv = (TextView)view.findViewById(R.id.list_jump_to);
         tv.setText(R.string.jump_to);
         final EditText et = (EditText)view.findViewById(R.id.list_jump_edit);
@@ -859,8 +859,8 @@ public class GalleryListActivity extends AbsGalleryActivity
                 lus = new ListUrls();
                 lus.setSearchImage(intent.getStringExtra(KEY_IMAGE_KEY),
                         intent.getStringExtra(KEY_IMAGE_URL),
-                        EhClient.IMAGE_SEARCH_USE_SIMILARITY_SCAN | EhClient.IMAGE_SEARCH_SHOW_EXPUNGED); // TODO
-                mTitle = "类似内容"; // TODO
+                        EhClient.IMAGE_SEARCH_USE_SIMILARITY_SCAN);
+                mTitle = getString(R.string.similar_content); // TODO
                 setTitle(mTitle);
                 refresh();
                 break;
diff --git a/src/com/hippo/ehviewer/widget/RefreshTextView.java b/src/com/hippo/ehviewer/widget/RefreshTextView.java
index 69ba711ca..ec72fde1a 100644
--- a/src/com/hippo/ehviewer/widget/RefreshTextView.java
+++ b/src/com/hippo/ehviewer/widget/RefreshTextView.java
@@ -62,6 +62,10 @@ public class RefreshTextView extends TextView
         setOnClickListener(this);
     }
 
+    public void setDefaultRefresh(int tiprResId, OnRefreshListener listener) {
+        setDefaultRefresh(getContext().getString(tiprResId), listener);
+    }
+
     public void setDefaultRefresh(String tip, OnRefreshListener listener) {
         mDefaultTip = tip;
         mDefaultListener = listener;
diff --git a/src/com/hippo/ehviewer/windowsanimate/WindowsAnimate.java b/src/com/hippo/ehviewer/windowsanimate/WindowsAnimate.java
index 6e4c73363..aee552276 100644
--- a/src/com/hippo/ehviewer/windowsanimate/WindowsAnimate.java
+++ b/src/com/hippo/ehviewer/windowsanimate/WindowsAnimate.java
@@ -30,7 +30,6 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.OvershootInterpolator;
 
 import com.hippo.ehviewer.util.Constants;
-import com.hippo.ehviewer.util.Log;
 import com.hippo.ehviewer.util.ViewUtils;
 
 public final class WindowsAnimate
@@ -77,9 +76,6 @@ public final class WindowsAnimate
     @Override
     @SuppressLint("ClickableViewAccessibility")
     public boolean onTouch(View v, MotionEvent event) {
-
-        Log.d(TAG, "onTouch");
-
         Object obj = v.getTag();
         if (obj == null) {
             PointF p = new PointF();