diff --git a/res/values-ch/arrays.xml b/res/values-zh/arrays.xml
similarity index 100%
rename from res/values-ch/arrays.xml
rename to res/values-zh/arrays.xml
diff --git a/res/values-ch/colors.xml b/res/values-zh/colors.xml
similarity index 100%
rename from res/values-ch/colors.xml
rename to res/values-zh/colors.xml
diff --git a/res/values-ch/strings.xml b/res/values-zh/strings.xml
similarity index 77%
rename from res/values-ch/strings.xml
rename to res/values-zh/strings.xml
index 8e3da932b..10a8b5473 100644
--- a/res/values-ch/strings.xml
+++ b/res/values-zh/strings.xml
@@ -33,114 +33,115 @@
         <string name="importance_4">!</string>
         
         <!-- Repeat Interval Labels -->
-        <string name="repeat_days">Day(s)</string>
-        <string name="repeat_weeks">Week(s)</string>
-        <string name="repeat_months">Month(s)</string>
-        <string name="repeat_hours">Hour(s)</string>
+        <string name="repeat_days">天</string>
+        <string name="repeat_weeks">星期</string>
+        <string name="repeat_months">月</string>
+        <string name="repeat_hours">小时</string>
         
         <!-- Plurals -->
         <plurals name="Ntasks">
-            <item quantity="one">1 Task</item>
-            <item quantity="other">%d Tasks</item>
+            <item quantity="one">一个任务</item>
+            <item quantity="two">两个任务</item>
+            <item quantity="other">%d个任务</item>
         </plurals>
         <plurals name="NactiveTasks">
-            <item quantity="one">%d / %d Active</item>
-            <item quantity="other">%d / %d Active</item>
+            <item quantity="one">%d / %d 需要作</item>
+            <item quantity="other">%d / %d 需要作</item>
         </plurals>
         <plurals name="Nalarms">
-            <item quantity="one">One Alarm</item>
-            <item quantity="two">Two Alarms</item>
-            <item quantity="other">%d Alarms</item>
+            <item quantity="one">一个闹钟</item>
+            <item quantity="two">两个闹钟</item>
+            <item quantity="other">%d个闹钟</item>
         </plurals>
         <plurals name="Ntags">
-            <item quantity="one">1 Tag</item>
-            <item quantity="other">%d Tags</item>
+            <item quantity="one">一个标签</item>
+            <item quantity="two">两个标签</item>
+            <item quantity="other">%d个标签</item>
         </plurals>
         
         <!-- Time Constants -->
         <string name="dateFormatter">MMM d</string> <!-- used for long due 
             dates. c.f. Java's SimpleDateFormat -->
-        <string name="daysVertical">D\na\ny\ns</string> <!-- vertical labels
+        <string name="daysVertical">天</string> <!-- vertical labels
             are used in the number dialogs -->
-        <string name="hoursVertical">H\no\nu\nr\ns</string>
+        <string name="hoursVertical">小\n时</string>
         <plurals name="Ndays">
-            <item quantity="one">1 Day</item>
-            <item quantity="other">%d Days</item>
+            <item quantity="one">一天</item>
+            <item quantity="other">%d天</item>
         </plurals>
         <plurals name="Nhours">
-            <item quantity="one">1 Hour</item>
-            <item quantity="other">%d Hours</item>
+            <item quantity="one">一小时</item>
+            <item quantity="other">%d小时</item>
         </plurals>
         <plurals name="Nminutes">
-            <item quantity="one">1 Minute</item>
-            <item quantity="other">%d Minutes</item>
+            <item quantity="one">一分钟</item>
+            <item quantity="other">%d分钟</item>
         </plurals>
         <plurals name="Nseconds">
-            <item quantity="one">1 Second</item>
-            <item quantity="other">%d Seconds</item>
+            <item quantity="one">一秒钟</item>
+            <item quantity="other">%d秒钟</item>
         </plurals>
         <plurals name="NhoursShort">
-            <item quantity="one">1 Hr</item>
-            <item quantity="other">%d Hrs</item>
+            <item quantity="one">一小时</item>
+            <item quantity="other">%d小时</item>
         </plurals>
         <plurals name="NminutesShort">
-            <item quantity="one">1 Min</item>
-            <item quantity="other">%d Min</item>
+            <item quantity="one">一分钟</item>
+            <item quantity="other">%d分钟</item>
         </plurals>
         <plurals name="NsecondsShort">
-            <item quantity="one">1 Sec</item>
-            <item quantity="other">%d Sec</item>
+            <item quantity="one">一秒钟</item>
+            <item quantity="other">%d秒钟</item>
         </plurals>
-        <string name="ago_suffix">Ago</string><!-- appended after time
+        <string name="ago_suffix">以前</string><!-- appended after time
             constants to show time in past -->
         
     <!-- TaskList -->
     <skip />
         <!-- title bar -->
         <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">Tagged \"%s\": </string>
-        <string name="taskList_hiddenSuffix"> hidden</string>
-        <string name="addtask_label">New Task</string>
-        <string name="missing_tag">Could Not Find Requested Tag!</string>
+        <string name="taskList_titleTagPrefix">\"%s\"标签: </string>
+        <string name="taskList_hiddenSuffix">藏</string>
+        <string name="addtask_label">新任务</string>
+        <string name="missing_tag">没有这个标签!</string>
         
         <!-- text in the actual list -->
-        <string name="taskList_hiddenPrefix">H</string><!-- prefix to show that a task is hidden -->
-        <string name="taskList_dueRelativeTime">Due in</string><!-- i.e. Due in 4 days -->
-        <string name="taskList_dueAbsoluteDate">Due on</string><!-- i.e. Due on Jan 2 -->
-        <string name="taskList_goalPrefix">Goal</string><!-- prefix to deadline -->
-        <string name="taskList_overdueBy">Overdue by</string>
-        <string name="taskList_completedPrefix">Finished</string><!-- i.e. Finished 4 days ago -->
-		<string name="taskList_estimatedTimePrefix">Estimated:</string><!-- i.e.  Estimated 4: hours -->
-        <string name="taskList_elapsedTimePrefix">Spent:</string><!-- i.e. Spent  88 minutes on tax. -->
+        <string name="taskList_hiddenPrefix">藏</string><!-- prefix to show that a task is hidden -->
+        <string name="taskList_dueRelativeTime">到期还有</string><!-- i.e. Due in 4 days -->
+        <string name="taskList_dueAbsoluteDate">到期在</string><!-- i.e. Due on Jan 2 -->
+        <string name="taskList_goalPrefix">希望</string><!-- prefix to deadline -->
+        <string name="taskList_overdueBy">过期</string>
+        <string name="taskList_completedPrefix">完成了</string><!-- i.e. Finished 4 days ago -->
+		<string name="taskList_estimatedTimePrefix">估计:</string><!-- i.e.  Estimated 4: hours -->
+        <string name="taskList_elapsedTimePrefix">花了:</string><!-- i.e. Spent  88 minutes on tax. -->
         <string name="taskList_periodicReminderPrefix">Poke Every</string><!-- time interval to set frequency to remind user -->
         <string name="taskList_repeatPrefix">Repeats Every</string><!-- time interval to set repeated tasks-->
         <string name="taskList_alarmPrefix">Next Alarm:</string>
-        <string name="taskList_tagsPrefix">Tags:</string>
-        <string name="taskList_notesPrefix">Notes:</string>
-        <string name="taskList_createdPrefix">Created:</string><!-- Created: MM/DD/YY -->
-        <string name="taskList_deleted">Deleted</string><!-- Deleted: MM/DD/YY -->
+        <string name="taskList_tagsPrefix">标签:</string>
+        <string name="taskList_notesPrefix">笔记:</string>
+        <string name="taskList_createdPrefix">造时:</string><!-- Created: MM/DD/YY -->
+        <string name="taskList_deleted">删时：</string><!-- Deleted: MM/DD/YY -->
         
         <!-- menu items -->
-        <string name="taskList_menu_insert">Add</string><!-- Add or Insert -->
-        <string name="taskList_menu_tags">Tags</string>
+        <string name="taskList_menu_insert">加</string><!-- Add or Insert -->
+        <string name="taskList_menu_tags">标签</string>
         <string name="taskList_menu_filters">Display</string>
-        <string name="taskList_menu_syncshortcut">Sync</string>
-        <string name="taskList_menu_more">More</string>
-        <string name="taskList_menu_sync">Synchronization</string>
-        <string name="taskList_menu_settings">Settings</string>
-        <string name="taskList_menu_help">Help (opens in Browser)</string>
-        <string name="taskList_menu_survey">Take Astrid\'s Survey!</string>
-        <string name="taskList_menu_tips">Quick Tips</string>
-        <string name="taskList_menu_cleanup">Clean Up Old Tasks</string>
-        
-        <string name="taskList_context_edit">Edit Task</string>
-        <string name="taskList_context_delete">Delete Task</string>
-        <string name="taskList_context_startTimer">Start Timer</string>
-        <string name="taskList_context_stopTimer">Stop Timer</string>
-        <string name="taskList_context_postpone">Postpone</string>
+        <string name="taskList_menu_syncshortcut">同步</string>
+        <string name="taskList_menu_more">。。。</string>
+        <string name="taskList_menu_sync">同步</string>
+        <string name="taskList_menu_settings">设定</string>
+        <string name="taskList_menu_help">帮助</string>
+        <string name="taskList_menu_tips">忠告</string>
+        <string name="taskList_menu_cleanup">打扫老任务</string>
+        
+        <string name="taskList_context_edit">编辑</string>
+        <string name="taskList_context_delete">删除</string>
+        <string name="taskList_context_startTimer">计时</string>
+        <string name="taskList_context_stopTimer">停计时</string>
+        <string name="taskList_context_postpone">延期</string>
         
         <!-- filter menu -->
-        <string name="taskList_filter_title">Sort/Filters</string>
+        <string name="taskList_filter_title">分类</string>
         <string name="taskList_filter_hidden">Hidden/Blocked Tasks</string>
         <string name="taskList_filter_done">Completed Tasks</string>
         <string name="taskList_filter_tagged">Tagged \'%s\'</string>
@@ -150,30 +151,30 @@
         <string name="taskList_sort_reverse">Sort Reverse</string>
         
         <string name="taskList_nonag_reminder">Select an Action:</string>
-        <string name="taskList_postpone_count">Times You\'ve Postponed: %d</string>
-        <string name="taskList_postpone_dialog">Postpone for how long?</string>
+        <string name="taskList_postpone_count">延期了%d次</string>
+        <string name="taskList_postpone_dialog">延期多少时间？</string>
         <string name="taskList_cleanup_dialog">"Delete completed tasks older than # days:"</string>
 
     <!-- TaskEdit -->
     <skip />
         <!-- title bar -->
-        <string name="taskEdit_titleGeneric">Astrid: Editing Task</string>
-        <string name="taskEdit_titlePrefix">Astrid: Editing </string>
-        <string name="taskEdit_label">Astrid: New Task</string>
+        <string name="taskEdit_titleGeneric">Astrid: 编辑任务</string>
+        <string name="taskEdit_titlePrefix">Astrid: 编辑</string>
+        <string name="taskEdit_label">Astrid: 新任务</string>
         
         <!-- tabs -->
-        <string name="task_edit_tab_1">Basic</string>
-        <string name="task_edit_tab_2">Dates</string>
-        <string name="task_edit_tab_3">Alerts</string>
+        <string name="task_edit_tab_1">细目</string>
+        <string name="task_edit_tab_2">时</string>
+        <string name="task_edit_tab_3">闹钟</string>
         
         <!-- labels -->
-        <string name="name_label">Summary</string>
-        <string name="name_hint">Task Description</string>
-        <string name="importance_label">How Important is it?</string>
-        <string name="tags_label">Tags:</string>
+        <string name="name_label">总结</string>
+        <string name="name_hint">任务总结</string>
+        <string name="importance_label">多少要紧</string>
+        <string name="tags_label">标签:</string>
         
-        <string name="estimatedDuration_label">How Long Will it Take?</string>
-        <string name="elapsedDuration_label">Time Already Spent on Task</string>
+        <string name="estimatedDuration_label">需要多少时间?</string>
+        <string name="elapsedDuration_label">已经花了多少时间？</string>
         <string name="definiteDueDate_label">Absolute Deadline</string>
         <string name="preferredDueDate_label">Goal Deadline</string>
         <string name="addToCalendar_label">Add Task To Calendar</string>
diff --git a/res/values-ch/styles.xml b/res/values-zh/styles.xml
similarity index 100%
rename from res/values-ch/styles.xml
rename to res/values-zh/styles.xml