Merge branch 'sidebar_config' into ntu

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb

config/locales/en.yml

@@ -284,7 +284,9 @@ en:
     text: Text Area
   passed: Approved
   password: Password
-  password_confirmation: Password Confirmation
+  password_change: Change password
+  password_confirmation: Password confirmation
+  password_current: Current password
   pending: Pending
   picture: Picture
   placeholder: Placeholder
@@ -327,11 +329,13 @@ en:
     description: Site description
     description_help: ''
     footer: Site footer
+    header: Site header
     footer_help: ''
     info: Site information
     keywords: Site keywords
     keywords_help: ''
     language: Site language
+    mobile_version: Mobile version
     search: Site Search
     search_help: Please Enter the search argument for Google search.
     settings: Site setting

config/locales/mobile.en.yml

@@ -0,0 +1,11 @@
+en:
+
+  mobile:
+    bulletin: Bulletin
+    contact: Contact
+    copyright: Copyright
+    home: Home
+    language: Language
+    location: Location
+    location_description: '<h3>國立政治大學</h3>11605 臺北市文山區指南路二段64號'
+    page: Page

config/locales/mobile.zh_tw.yml

@@ -0,0 +1,11 @@
+zh_tw:
+
+  mobile:
+    bulletin: 公告
+    contact: 聯絡資訊
+    copyright: 版權宣告
+    home: 首頁
+    language: 語言
+    location: 地理位置
+    location_description: '<h3>國立政治大學</h3>11605 臺北市文山區指南路二段64號'
+    page: 頁面

config/locales/zh_tw.yml

@@ -234,6 +234,9 @@ zh_tw:
     text: 文字區域
   passed: 通過審核
   password: 密碼
+  password_change: 更改密碼
+  password_confirmation: 確認密碼
+  password_current: 目前的密碼
   pending: 待審核
   picture: 圖片
   postdate: 張貼日期
@@ -270,11 +273,13 @@ zh_tw:
     description: 網站描述
     description_help: ''
     footer: 網站頁尾
+    header: 網站頁首
     footer_help: ''
     info: 網站資訊
     keywords: 搜尋關鍵字
     keywords_help: ''
     language: 網站語言
+    mobile_version: 手機版
     search: 網站搜尋
     search_help: 請輸入送交Google搜尋的參數
     settings: 基本設定
@@ -327,6 +332,9 @@ zh_tw:
       page: 頁面已更新成功
       user: 使用者已更新成功
     success_: 更新成功
+      paper: Paper was successfully updated.
+      user: User was successfully updated.
+    success_: S使用者已更新成功
   update_: 更新
   update_at: 最後更新時間
   url: 網址