Changes in I18n (except personal_conference and personal_journal)

config/locales/en.yml

@@ -5,19 +5,19 @@ en:
   access:
     denied:
       app:
-        not_sub_manager: Access Denied for you are not SubManager for this app
-        not_manager: Access Denied for you are not Manager for this app
         not_authed_user: Access Denied for you are not User for this app
-      object: Access Denied for you don't have permission for this object
+        not_manager: Access Denied for you are not Manager for this app
+        not_sub_manager: Access Denied for you are not SubManager for this app
       not_admin: Access Denied for you are not Admin
+      object: Access Denied for you don't have permission for this object
   account_settings: Account settings  
   academic_info: Academic Info.
   action: Action
   ad:
-    chinese_1: 在套圖中出現次數 1次請輸入1
-    chinese_2: 輸入連結
-    chinese_3: 輸入標題
-    ab_fx: FX
+    chinese_1: Enter 1, if it shows once in a series
+    chinese_2: Type Link
+    chinese_3: Type Title
+    ab_fx: Effect
     add_link: Add a reference link
     banner_best_size: Banner Best Size
     best_size: Best size
@@ -42,14 +42,14 @@ en:
   add_image: Add image
   add_item: Add item
   add_member: Create New Member
-  add_more: Exteudable Field
+  add_more: Extendable Field
   address_modal:
+    city: City
+    country: Country
+    county: County
     default_title: Address
     street_address: Street address
-    city: City
-    county: County
     zip: ZIP
-    country: Country
   addthis_tools:
     add_to_bookmark: Add this to bookmark
   admin: Admin
@@ -63,11 +63,11 @@ en:
   app_auth:
     list_setting_result: Authorization List
     assigning_manager:
-      add_manager_fail: Manager successfully added
-      add_manager_ok: Adding manager failed
+      add_manager_fail: Adding manager failed
+      add_manager_ok: Manager successfully added
     assigning_sub_manager:
-      add_sub_manager_fail: Sub-manager successfully added
-      add_sub_manager_ok: Adding sub-manager failed
+      add_sub_manager_fail: Adding sub-manager failed
+      add_sub_manager_ok: Sub-manager successfully added
     can_not_add_this_user: This user cannot be added
     delete_manager:
       fail: Removal of manager failed
@@ -131,20 +131,19 @@ en:
   data: Data
   date:
     calendar: Calendar Era
-    range: Enable Time Period
     format: 格式
-    tw_calendar: R.O.C Year.
     minguo_calendar: 
       after: 民國
       before: 民前
       first_year: 民國元年
-      year: Year
       month: Month
+      year: Year
+    range: Enable Time Period
+    tw_calendar: R.O.C Year.
     west_calendar: A.C.
   date_: Date
   dashboard:
     bulletin: Announcement
-    news_bulletin: News
     page_context: Page
     web_link: Link
   dashboard_: Dashboard
@@ -152,7 +151,28 @@ en:
   default: Default
   default_css: Default CSS
   default_widget:
+    caption:
+      typeA: 
+      typeB_style2: 
+      typeB_style3: 
+      typeB_style4: 
+      typeC: 
+    data_source:
+      category: 
+      tag: 
     default_widget: Default Widget
+    field_is_link: 
+    fields_: 
+    fields_order: 
+    fields_style: 
+    name: 
+    no_support_setting: 
+    no_value: 
+    select_module_app: 
+    select_widget_ext_option: 
+    select_widget_path: 
+    select_widget_style: 
+    widget_data_count: 
   delete:
     file: Delete file
     success:
@@ -188,6 +208,11 @@ en:
   followers: Followers
   forgot_password: Forgot your password?
   frequency: Frequency
+  front_page:
+    select_app_url: 
+    is_published: 
+    menu_enable_lang: 
+    link_enable_lang: 
   frontend_data_count: Frontend data count
   gallery: Gallery
   groups: Groups
@@ -206,7 +231,7 @@ en:
   is_published: Is published
   item: Item
   item_name: Name
-  javascripts: Javascripts
+  javascripts: JavaScripts
   key: Index Keys
   last_modified: Last modified
   layout: Layout
@@ -223,12 +248,13 @@ en:
   list_lower: list
   lists:
     markups:
-      text_field: Text Field
-      select: Select
-      date: Date
-      text_area: Text Area
-      radio_button: Radio button
+      address: Address Field
       checkbox: Checkbox
+      date: Date
+      radio_button: Radio button
+      select: Select
+      text_area: Text Area
+      text_field: Text Field
   locale: Locale
   location: Location
   login: Login
@@ -238,12 +264,12 @@ en:
     authentication: Authentication
     domain: Domain
     enable_starttls_auto: Enable Start TLS Auto
+    manager: Manager
     password: Password
     port: Port
     setting: Mail settings
     tls: TLS
     user_name: User Name
-    manager: Manager
   manager: Manager
   markup: Markup
   markup_options: Markup options
@@ -268,16 +294,16 @@ en:
     asset: New asset
     banner: New banner
     design: New design
+    info: New user information
     link: New link
     page: New page
-    user: New user
-    info: New user information
     role: New role
     sub_role: New sub role
+    user: New user
   new_: New
-  news: News
   no_: "No"
   no_deadline: No deadline
+  nothing: Nothing
   object_auth:
     a_object_must_have_only_one_object_auth_profile_for_each_action: ''
     list_title_of_users: authorization list
@@ -319,8 +345,14 @@ en:
   related_links: Related Links
   role: Role
   role_field: Role Field
-  Roles: Roles
+  roles: Roles
   ruling_site: Ruling Site
+  rulingcom:
+    errors:
+      init:
+        app_page_noname: 
+        module_app_noname: 
+  save_and_close: Save and close
   search:
     domains: Google Search Domains
     not_found: "NOT FOUND"
@@ -337,22 +369,23 @@ en:
     summary: Summary
     thumbnail: Thumbnail
   site:
+    default_image: Site default image
     description: Site description
-    description_help: ''
+    description_help: Description Guide
     footer: Site footer
+    footer_help: Footer Guide
     header: Site header
-    footer_help: ''
     info: Site information
     keywords: Site keywords
-    keywords_help: ''
+    keywords_help: Keyword Guide
     language: Site language
     mobile_version: Mobile version
     search: Site Search
     search_help: Please Enter the search argument for Google search.
     settings: Site setting
     sub_menu: Site sub-menu
-    title: Site title
-    title_help: ''
+    title: Site Title
+    title_help: Site Title Guide
   site_: Site
   site_info: Site Info
   sitemap: Sitemap
@@ -410,7 +443,7 @@ en:
   update_: Update
   update_at: Update at
   url: URL
-  use_status: ''
+  use_status: Use Statue
   user: User
   version: Version
   vertical: Vertical

config/locales/mobile.en.yml

@@ -4,10 +4,10 @@ en:
     bulletin: Bulletin
     contact: Contact
     copyright: Copyright
-    copyright_text: National Chengchi University © All RIGHTS RESERVED. 
-    copyright_orbit: Developed by RulingDigital
+    copyright_text: Thisi University © All RIGHTS RESERVED. 
+    copyright_orbit: Powered by RulingDigital
     home: Home
     language: Language
     location: Location
-    location_description: '<h3>National Chengchi University</h3>NO.64,Sec.2,ZhiNan Rd.,Wenshan District,Taipei City 11605,Taiwan (R.O.C)'
+    location_description: '<h3>This University</h3>No.101,Sec. 2, Jiafeng S Road, Zhubei City, Hsinchu County 302, Taiwan'
     page: Page

config/locales/mobile.zh_tw.yml

@@ -3,11 +3,11 @@ zh_tw:
   mobile:
     bulletin: 公告
     contact: 聯絡資訊
-    copyright: 版權宣告
-    copyright_text: 本網站著作權屬於國立政治大學。
+    copyright: 著作權宣告
+    copyright_text: 本網站著作權屬於本大學。
     copyright_orbit: 銳綸數位建置
     home: 首頁
     language: 語言
     location: 地理位置
-    location_description: '<h3>國立政治大學</h3>11605 臺北市文山區指南路二段64號'
+    location_description: '<h3>本大學</h3>302新竹縣竹北市嘉豐南路二段101號'
     page: 頁面

config/locales/mongoid.zh_tw.yml

@@ -54,13 +54,10 @@ zh_tw:
 
 
     models:
-      news_bulletin: 新聞
       bulletin: 公告
       ad_banner: 廣告輪播
       web_link: 連結管理
     attributes:
-      news_bulletin:
-        title: 新聞標題
       bulletin:
         title: 公告標題
       ad_banner: