Fix after merge from NCCU, the translations still need to be cleaned

config/locales/en.yml

@@ -214,14 +214,14 @@ en:
     text: Text Area
   passed: Approved
   password: Password
-<<<<<<< HEAD
+# : <<<<<<< HEAD
   pending: Pending
   picture: Picture
   postdate: Postdate
   posted_by: Posted by
   preview: Preview
   purchase: Purchase
-=======
+# : =======
   register: Register
   remember_me: Remember me
   search_google: Search Google
@@ -247,7 +247,7 @@ en:
   member: Member
   module: Module
   most_visited_page: Most Visited Page
->>>>>>> various_bugs
+# : >>>>>>> various_bugs
   quantity: Quantity
   quick_edit: Quick edit
   recent_update: Recent Update
@@ -347,7 +347,7 @@ en:
   visitors_today: Today's visitors
   yes_: "Yes"
 
-<<<<<<< HEAD
+# : <<<<<<< HEAD
   nccu:
     date: Date
     file: File
@@ -356,7 +356,7 @@ en:
     link_name: Name
     picture: Picture
     selected_file: File
-=======
+# : =======
   errors:
     at_least_one: must at least have one value
 
@@ -530,11 +530,11 @@ en:
     site_title: Site title
     super_pages: Super pages
     structure: Structure
->>>>>>> various_bugs
+# : >>>>>>> various_bugs
     tags: Tags
     url: URL
-<<<<<<< HEAD
-=======
+# : <<<<<<< HEAD
+# : =======
     user: User
     user_new_interface: 
       sys_basic_form: User system info
@@ -585,4 +585,4 @@ en:
     result_get: "Searched about '  %{search_word}  ' Found %{item_num} items"
     too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
     unit_get: "Listed items created by :%{unit_name}  Found %{item_num} items"
->>>>>>> various_bugs
+# : >>>>>>> various_bugs

config/locales/zh_tw.yml

@@ -338,8 +338,8 @@ zh_tw:
 
 
 
-<<<<<<< HEAD
-=======
+# : <<<<<<< HEAD
+# : =======
   errors:
     at_least_one: 必須至少有一個值
     
@@ -603,7 +603,7 @@ zh_tw:
     
     
     
->>>>>>> various_bugs
+# : >>>>>>> various_bugs
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
   date:
@@ -818,7 +818,7 @@ zh_tw:
           other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "以下欄位發生問題："
 
-<<<<<<< HEAD
+# : <<<<<<< HEAD
   mongoid:
     models:
       news_bulletin: 新聞
@@ -835,7 +835,7 @@ zh_tw:
       web_link:
         title: 名稱
         url: 路徑
-=======
+# : =======
   helpers:
     select:
       prompt: "請選擇"
@@ -856,4 +856,4 @@ zh_tw:
   object_disable:
     change_to_true: "設為停用"
     change_to_false: "重新啓用"
->>>>>>> various_bugs
+# : >>>>>>> various_bugs

config/mongoid.yml

@@ -2,7 +2,7 @@ defaults: &defaults
   host: localhost
   # slaves:
   #   - host: slave1.local
-  port: 37017
+  port: 27017
   #   - host: slave2.local
   #     port: 27019