Update zh-HANT.coffee

app/locale/zh-HANT.coffee

@@ -388,8 +388,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
-#    free: "Free"
+    free: "免費"
-#    month: "month"
+    month: "月"
     subscribe_title: "訂閱"
     unsubscribe: "取消訂閱"
     confirm_unsubscribe: "確認訂閱"
@@ -397,7 +397,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     thank_you_months_prefix: "感謝您這幾個"
     thank_you_months_suffix: "月來的支持"
     thank_you: "感謝您支持CodeCombat."
-<<<<<<< HEAD
     sorry_to_see_you_go: "捨不得您離開! 請讓我們知道我們如何做得更好."
     unsubscribe_feedback_placeholder: "O, 我們做錯事了嗎?"
     levels: "獲得更多新關卡來磨練!"
@@ -409,27 +408,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     parents_blurb1: "使用CodeCombat, 您的孩子學習真正的編寫程式. 他們學習從簡單的指令，漸進到更加進階的課題."
     parents_blurb2: "每月支付$9.99美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助."
     parents_blurb3: "沒有風險: 保證100%退費, 一步取消訂閱."
-=======
-#    sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-#    unsubscribe_feedback_placeholder: "O, what have we done?"
-#    levels: "Get more practice with bonus levels!"
-#    heroes: "More powerful heroes!"
-#    gems: "3500 bonus gems every month!"
-#    items: "Over 250 bonus items!"
-#    parent_button: "Ask your parent"
-#    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-#    parent_email_input_invalid: "Email address invalid."
-#    parent_email_input_label: "Parent email address"
-#    parent_email_input_placeholder: "Enter parent email"
-#    parent_email_send: "Send Email"
-#    parent_email_sent: "Email sent!"
-#    parent_email_title: "What's your parent's email?"
-#    parents: "For Parents"
-#    parents_title: "Your child will learn to code."
-#    parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics."
-#    parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers."
-#    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
->>>>>>> upstream/master
     subscribe_button: "現在訂閱"
     stripe_description: "每月訂閱"
     subscription_required_to_play: "你將需要訂閱來開啟這關."
@@ -635,9 +613,9 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     saved: "修改已儲存"
     password_mismatch: "密碼不正確。"
     password_repeat: "請重複輸入你的密碼。"
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
+    job_profile: "工作經歷" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
+    job_profile_approved: "你的工作經歷已被CodeCombat驗證. 僱主將可以隨意瀏覽直到你設定為不啟動狀態或者已經四周沒有改變"
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
+    job_profile_explanation: "Hi! 請填寫下列資訊, 我們將使用它幫你媒合一份開發工作."
     sample_profile: "觀看範例基本資料"
     view_profile: "瀏覽你的基本資料"
 
@@ -652,14 +630,14 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     continue_script: "使用最後一次使用的腳本"
     skip_scripts: "略過之前所有腳本"
     toggle_playback: "執行/暫停開關"
-#    scrub_playback: "Scrub back and forward through time."
+    scrub_playback: "向前/向後移動一段時間"
-#    single_scrub_playback: "Scrub back and forward through time by a single frame."
+    single_scrub_playback: "向前/向後移動一個畫面"
-#    scrub_execution: "Scrub through current spell execution."
+    scrub_execution: "向前/向後移動一句語句"
-#    toggle_debug: "Toggle debug display."
+    toggle_debug: "顯示/關閉除錯訊息"
-#    toggle_grid: "Toggle grid overlay."
+    toggle_grid: "顯示/關閉網格提示"
-#    toggle_pathfinding: "Toggle pathfinding overlay."
+    toggle_pathfinding: "顯示/關閉路徑尋找提示"
-#    beautify: "Beautify your code by standardizing its formatting."
+    beautify: "利用標準格式來美化你的代碼"
-#    maximize_editor: "Maximize/minimize code editor."
+    maximize_editor: "最大化/最小化代碼編輯器"
 
   community:
     main_title: "CodeCombat社群"