Changes in I18n (except personal_conference and personal_journal)

app/views/admin/assets/file_upload.html.erb

@@ -54,7 +54,7 @@
     </div>
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
-            <!-- <a id='ajax_form_submit' class="btn btn-primary"><#%= t(:create) %></a> -->
+            <!-- <a id='ajax_form_submit' class="btn btn-primary"><#%= t(:create_) %></a> -->
              <input type="submit" value="<%= t(:create_) %>" class="btn btn-primary" />
         </div>
     </div>

app/views/admin/designs/_form.html.erb

@@ -18,5 +18,5 @@
 			<%= f.text_field :intro %>
     </div>
   </div>
-    <%= f.submit t('update') %>
+    <%= f.submit t(:update_) %>
 <% end %>

app/views/admin/designs/_new.html.erb

@@ -5,6 +5,6 @@
   <%= render :partial => "form", :locals => { :f => f } %>
   
   <p>
-    <%= f.submit t('create') %> <%= link_back %>
+    <%= f.submit t(:create_) %> <%= link_back %>
   </p>
 <% end %>

app/views/admin/designs/new.html.erb

@@ -10,6 +10,6 @@
   
   <div class="button_bar">
    	<%= link_back %>
-	<%= f.submit t('create') %>
+	<%= f.submit t(:create_) %>
   </div>
 <% end %>

app/views/admin/pages/_edit.html.erb

@@ -4,7 +4,7 @@
 	<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">
-			<%= f.submit t('update'), :class => 'btn btn-primary' %>
+			<%= f.submit t(:update_), :class => 'btn btn-primary' %>
 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
 		</div>
 	<% end %>

app/views/admin/pages/_new.html.erb

@@ -4,7 +4,7 @@
 	<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">
-			<%= f.submit t('create'), :class => 'btn btn-primary' %>
+			<%= f.submit t(:create_), :class => 'btn btn-primary' %>
 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
 		</div>
 	<% end %>

app/views/admin/sites/site_info.html.erb

@@ -96,7 +96,7 @@
                   <% if @site.default_image.file %>
                     <label class="checkbox">
                     <%= check_box_tag 'site[remove_default_image]' %>
-                    <%= t('delete') %>
+                    <%= t(:delete_) %>
                     </label>
                   <% end %>
                 </div>

app/views/admin/users_new_interface/edit.html.erb

@@ -25,7 +25,7 @@
       <%= render :partial => 'form', :locals => { :f => f } %>
       <div class="button_bar">
         <%= link_back %>
-      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      <%= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
       </div>
     <% end -%>
 

app/views/admin/users_new_interface/new.html.erb

@@ -25,7 +25,7 @@
       <%= render :partial => 'form', :locals => { :f => f } %>
       <div class="button_bar">
         <%#= link_back %>
-      <%#= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      <%#= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
       <%= f.submit%>
       </div>
     <% end -%>

app/views/admin/users_new_interface/temp_edit.html.erb

@@ -19,7 +19,7 @@
       <%= render :partial => 'temp_form', :locals => { :f => f } %>
       <div class="button_bar">
         <%= link_back %>
-      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      <%= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
       </div>
     <% end -%>
 

app/views/shared/attribute_field/_address_modal_dialog.html.erb

@@ -57,6 +57,6 @@
     </div>
     <div class="modal-footer">
         <button class="btn" data-dismiss="modal" aria-hidden="true"><%=t(:close)%></button>
-        <button href="" class="btn btn-primary bt-save" data-dismiss="modal" aria-hidden="true"><%=t("modal.save_and_close")%></button>
+        <button href="" class="btn btn-primary bt-save" data-dismiss="modal" aria-hidden="true"><%=t(:save_and_close)%></button>
     </div>
 </div>

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_1: Enter 1, if it shows once in a series
-    chinese_2: 輸入連結
+    chinese_2: Type Link
-    chinese_3: 輸入標題
+    chinese_3: Type Title
-    ab_fx: FX
+    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_fail: Adding manager failed
-      add_manager_ok: Adding manager failed
+      add_manager_ok: Manager successfully added
     assigning_sub_manager:
-      add_sub_manager_fail: Sub-manager successfully added
+      add_sub_manager_fail: Adding sub-manager failed
-      add_sub_manager_ok: 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
+      address: Address Field
-      select: Select
-      date: Date
-      text_area: Text Area
-      radio_button: Radio button
       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: Site Title
-    title_help: ''
+    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_text: Thisi University © All RIGHTS RESERVED. 
-    copyright_orbit: Developed by RulingDigital
+    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: 著作權宣告
-    copyright_text: 本網站著作權屬於國立政治大學。
+    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:

lib/orbit_app/module/widget.rb

@@ -178,7 +178,7 @@ module OrbitApp
             option = options[0]
             @options[opt_name] = {:label_i18n=>option[:i18n] , :opts=>option[:options_item]}
             # options =>   :i18n => "gallery.widget_option.vertical",:options_item=>[1, 2]
-            #                        :i18n =>"gallery.widget_option.album",:options_item => {"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}
+            #                        :i18n =>"gallery.album",:options_item => {"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}
           end
 
 

lib/tasks/migrate.rake

@@ -121,7 +121,7 @@ namespace :migrate do
     if a
       a.widgets = {}
       a.widgets[:widget1] = []
-      a.widget_options_fields_i18n = {"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.widget_option.album"}} 
+      a.widget_options_fields_i18n = {"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.album"}} 
       a.widget_options = {"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6], "album_id"=>{"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}}} 
       a.save  
     end

vendor/built_in_modules/ad_banner/config/locales/en.yml

@@ -1,4 +1,4 @@
 en:
 
-  ad_banner:
+  module_name:
     ad_banner: Ad Banner

vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml

@@ -1,3 +1,4 @@
 zh_tw:
+
   module_name:
     ad_banner: 廣告輪播

vendor/built_in_modules/ad_banner/init.rb

@@ -33,7 +33,7 @@ module AdBanner
     # end
     
     side_bar do
-      head_label_i18n  'ad_banner.ad_banner',:icon_class=>"icons-landscape"
+      head_label_i18n  'module_name.ad_banner',:icon_class=>"icons-landscape"
       available_for [:admin,:guest,:manager,:sub_manager]
       active_for_controllers ({:public=>['admin/ad_banners', 'admin/ad_images']})
 

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -11,7 +11,7 @@
 			<div class="widget-action clear tip" title="Upload pictures">
 				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-pictures"></i><%= t('nccu.picture') %></h3>
+			<h3 class="widget-title"><i class="icons-pictures"></i><%= t('announcement.picture') %></h3>
 			<div class="widget-content clear">
 				<div class="control-group">
            <!-- <img class="pull-left upload-picture" src="/assets/default-img.png" /> -->
@@ -93,7 +93,7 @@
 			<div class="widget-action clear tip" title="Setting">
 				<a class="action"><i class="icon-cog icon-white"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i><%= t('nccu.tags') %></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t(:tags) %></h3>
 				<div class="widget-content clear form-horizontal">
 					<p>
 						<% @tags.each do |tag| %>
@@ -188,8 +188,8 @@
 					<table class="table table-condensed">
 						<thead>
 							<tr>
-								<th><%= t('nccu.url') %></th>
+								<th><%= t('announcement.url') %></th>
-								<th><%= t('nccu.link_name') %></th>
+								<th><%= t('announcement.link_name') %></th>
 								<th class="span1"></th>
 							</tr>
 						</thead>
@@ -224,7 +224,7 @@
 					<div class="widget-action clear tip" title="Added to the file">
 						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-paperclip"></i><%= t('nccu.file') %></h3>
+					<h3 class="widget-title"><i class="icons-paperclip"></i><%= t('announcement.file') %></h3>
 					<div class="widget-content">
 						
 					<div id='bulletin_files' class="bulletin_files_block">
@@ -232,9 +232,9 @@
 					<table class="table table-condensed">
 						<thead>
 							<tr>
-								<th><%= t('nccu.selected_file') %></th>
+								<th><%= t('announcement.selected_file') %></th>
-								<th><%= t('nccu.file_name') %></th>
+								<th><%= t('announcement.file_name') %></th>
-								<th><%= t('nccu.file_description') %></th>
+								<th><%= t('announcement.file_description') %></th>
 								<th class="span1"></th>
 							</tr>
 						</thead>

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -1,32 +1,37 @@
 en:
 
   announcement:
-    announcement: Announcement
+    add_new: Add New
-    approve_bulletin_fail: Announcement approval failed
-    approve_bulletin_success: Announcement was successfully approved
-    bulletins: Bulletins
-    create_bulletin_success: Announcement was successfully created 
-    create_bulletin_category_success: Announcement category successfully created
-    editing_announcement: Editing announcememt
-    editing_announcement_category: Editing announcememt category
-    error:
-      no_avilb_cate_for_posting: You need a category to submit your post,please contact admin
-    new_bulletin_category: New announcememt category
-    search: Search for Announcement
-    update_bulletin_success: Announcement was successfully updated
-    update_bulletin_category_success: Announcement category was successfully updated
     all_articles: All Articles
-    add_new: New
+    announcement: Announcement
-    widget:
+    approval_setting: Approval Setting
-        index: Index widget
+    approve_bulletin_fail: Approval Fail
-        bulletins_and_web_links: "Abreast of bulletins and web link"
+    approve_bulletin_success: Approve Successfully
-    #init don't merge
+    bulletins: Bulletins
-    all_articles: "All article"
+    categories: ategories
-    add_new: New
+    create_bulletin_success: Create Bulletin Successfully
-    categories: Categories
+    create_bulletin_category_success: Create Category Successfully
-    approval_setting: "Approval setting"
+    date: Announcement Date
-    tags: Tag
     default_widget:
-        bulletin_category_with_title: Category
+      bulletin_category_with_title: Bulletin Category with Title
-        title: Title
+      postdate: Post Date
-        postdate: "Post date"
+      title: Title
+    editing_announcement: Edit Announcement
+    editing_announcement_category: Edit Category
+    error:
+      no_avilb_cate_for_posting: No Available Category for Posting
+    file: Attachment
+    file_description: File Description
+    file_name: File Name
+    frontend:
+      bulletins: Announcement front-end
+    link_name: Link Name
+    new_bulletin_category: New Bulletin Category
+    picture: Cover Picture
+    search: Search
+    selected_file: Select File
+    update_bulletin_category_success: Update Category Successfully
+    url: URL
+    widget:
+      bulletins_and_web_links: Bulletins and Web Resources
+      index: Index

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -1,33 +1,37 @@
 zh_tw:
 
   announcement:
+    add_new: 新建
+    all_articles: 文章列表
     announcement: 公告
-    approve_bulletin_fail: 公告審核失敗
+    approval_setting: 審核設定
-    approve_bulletin_success: 公告成功通過審核
+    approve_bulletin_fail: 審核失敗
-    bulletins: 公告訊息
+    approve_bulletin_success: 審核成功
-    create_bulletin_success: 公告已成功建立
+    bulletins: 公告
-    create_bulletin_category_success: 公告類別已成功建立
+    categories: 類別
-    editing_announcement: 編輯公告
+    create_bulletin_success: 建立公告成功
-    editing_announcement_category: 編輯公告類別
+    create_bulletin_category_success: 建立類別成功
+    date: 起迄日期
+    default_widget:
+      bulletin_category_with_title: 公告類別及標題
+      postdate: 張貼日期
+      title: 標題
+    editing_announcement: 編輯類別
+    editing_announcement_category: 編輯類別
     error:
-      no_avilb_cate_for_posting: 公告必需有一個類別才能發送，請與管理員聯絡
+      no_avilb_cate_for_posting: 沒有可以張貼的類別
+    file: 附加檔案
+    file_description: 檔案描述
+    file_name: 檔案名稱
     frontend:
       bulletins: 公告前台
+    link_name: 連結名稱
     new_bulletin_category: 新增公告類別
-    search: 搜尋公告
+    picture: 刊頭圖片
-    update_bulletin_success: 公告已成功更新
+    search: 搜尋
-    update_bulletin_category_success: 公告類別已成功更新
+    selected_file: 選擇檔案
+    update_bulletin_category_success: 更新類別成功
+    url: 連結位置
     widget:
-        index: 目錄Widget
+      bulletins_and_web_links: 索引
-        bulletins_and_web_links: 公告與連結並排Widget
+      index: 索引
-    #init don't merge
-    all_articles: 全部公告
-    add_new: 新增
-    categories: 分類
-    approval_setting: 審核權限
-    tags: 標籤
-    default_widget:
-        to_more: 更多
-        bulletin_category_with_title: 分類
-        title: 標題
-        postdate: 張貼日期

vendor/built_in_modules/announcement/init.rb

@@ -67,7 +67,7 @@ module Announcement
                             :available_for => [:manager]
 
 
-      context_link 'announcement.tags',
+      context_link 'tags',
                             :link_path=>"panel_announcement_back_end_tags_path" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
@@ -115,7 +115,7 @@ module Announcement
     #                         :active_for_action=>{:bulletin_categorys=>:index},
     #                         :available_for => [:manager]
 
-    #   context_link 'announcement.tags',
+    #   context_link 'tags',
     #                         :link_path=>"panel_announcement_back_end_tags_path" ,
     #                         :priority=>4,
     #                         # :active_for_action=>{:bulletin_categorys=>:index},
@@ -128,7 +128,7 @@ module Announcement
                             :active_for_object_auth => 'BulletinCategory',
                             :available_for => [:manager]
 
-      context_link 'admin.module.authorization',
+      context_link 'module_authorization',
                             :link_path=>"admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: 'Announcement'}))",
                             :priority=>6,
                             :active_for_app_auth => 'Announcement',

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/show.html.erb

@@ -1,57 +0,0 @@
-<% # encoding: utf-8 %>
-
-<br />
-<br />
-<br />
-
-<p id="notice"><%= flash_messages %></p>
-
-<ul>
-	<li>
-  <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.title %>
-	</li>
-	<li>
-  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
-	</li>
-	<li>
-  <b><%= t('announcement.title') %></b>
-  <%= @bulletin.title %>
-	</li>
-	<li>
-  <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
-	</li>
-	<li>
-  <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle %>
-	</li>
-	<li>
-  <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text %>
-	</li>
-	<li>
-	<li>
-	<b><%= t('announcement.link') %></b>
-	<% @bulletin.bulletin_links.each do | blink | %>
-    <%= link_to blink.name, blink.url, :target => '_blank' %>
-	<% end %>
-	</li>
-	<li>
-	<b><%= t('announcement.file') %></b>
-	<% @bulletin.bulletin_files.each do | bfile | %>
-	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
-	<% end %>
-	</li>
-	<li>
-  <b><%= t('announcement.張貼者') %></b>
-  <%= User.find(@bulletin.create_user_id).name %>
-	</li>
-	<li>
-  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
-	</li>
-
-
-<%= link_back %>

vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_index.html.erb

@@ -45,9 +45,9 @@
 	</div>
 	<div class="pull_right"> 
 	<% if !params[:category_id].blank? %>
-	<%= link_to t('archive.read_more'), panel_archive_front_end_archive_files_path(:category_id => @part.category) %>
+	<%= link_to t(:more_plus), panel_archive_front_end_archive_files_path(:category_id => @part.category) %>
 	<% else %>
-	<%= link_to t('archive.read_more'), panel_archive_front_end_archive_files_path %>
+	<%= link_to t(:more_plus), panel_archive_front_end_archive_files_path %>
  	<% end %>
     </div>
 <% elsif @widget_style == '2' %>

vendor/built_in_modules/archive/config/locales/en.yml

@@ -1,136 +1,8 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
   archive:
-    all: All
     archive: Archive
+    frontend:
+      archive: Archive Front－end
     widget:
       index: Archive Widget
-    frontend:
-      archive: Archive Frontend
-    read_more: Read More
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/archive/config/locales/zh_tw.yml

@@ -1,31 +1,8 @@
 zh_tw:
 
-  _locale: 中文
   archive:
     archive: 檔案室
-    all: 全部檔案
-    widget:
-      index: 檔案室Widget
     frontend:
       archive: 檔案室前台
-    read_more: 閱讀更多
+    widget:
-  add: 新增
+      index: 檔案室Widget
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-    
-  panel:
-    
-    

vendor/built_in_modules/archive/init.rb

@@ -47,7 +47,7 @@ module Archive
 
       head_link_path "panel_archive_back_end_archive_files_path"
 
-      context_link 'archive.all',
+      context_link 'all',
                             :link_path=>"panel_archive_back_end_archive_files_path" ,
                             :priority=>1,
                             :active_for_action=>{:archive_files=>:index},

vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb

@@ -3,8 +3,8 @@
 		<span class="calendars_color_tag" style="background-color: <%= calendar.color %>"></span>
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
-				<li><%= link_to t("calendar.edit"), edit_panel_calendar_back_end_cal_path(calendar), :remote => true, :class=>"btn-edit-a", :for => calendar.id %></li>
+				<li><%= link_to t(:edit), edit_panel_calendar_back_end_cal_path(calendar), :remote => true, :class=>"btn-edit-a", :for => calendar.id %></li>
-				<li><%= link_to t("calendar.delete"), panel_calendar_back_end_cal_path(calendar), :method => "delete",:remote => true, :confirm => t("calendar.sure?"),:class=>"btn-del-a", "data-content"=>calendar.id.to_s %></li>
+				<li><%= link_to t(:delete_), panel_calendar_back_end_cal_path(calendar), :method => "delete",:remote => true, :confirm => t("sure?"),:class=>"btn-del-a", "data-content"=>calendar.id.to_s %></li>
 			</ul>
 		</div>
 	</td>

vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/new.html.erb

@@ -112,7 +112,7 @@
 	<div class="row-fluid">
 		<div class="span9 offset3">
 			<button class="btn btn-close">Cancel</button>
-			<%= f.submit t("calendar.create"), :class=>"btn" %>
+			<%= f.submit t(:create_), :class=>"btn" %>
 		</div>
 	</div>
 <% end %>

vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb

@@ -13,6 +13,6 @@
 	</div>
 </div>
 <div class="modal-footer">
-	<%= link_to t("calendar.delete"), panel_calendar_back_end_event_path(@event),:class => "btn bt-del", :method => :delete, :remote => true %>
+	<%= link_to t(:delete_), panel_calendar_back_end_event_path(@event),:class => "btn bt-del", :method => :delete, :remote => true %>
-	<%= link_to t("calendar.edit"), edit_panel_calendar_back_end_event_path(@event),:class => "btn btn-primary",:id=>"edit_event_btn" ,:remote => true %>
+	<%= link_to t(:edit), edit_panel_calendar_back_end_event_path(@event),:class => "btn btn-primary",:id=>"edit_event_btn" ,:remote => true %>
 </div>

vendor/built_in_modules/calendar/config/locales/en.yml

@@ -1,13 +1,8 @@
 en:
   calendar:
-     calendar_: Calendar
      calendar: Calendar
      calendars: Calendars
      color: Color
      name: Name
      save: Save
-     delete: Delete
      select_calendar: "Select Calendar"
-     create: Create
-     sure?: "Are you sure?"
-     edit: Edit

vendor/built_in_modules/calendar/config/locales/zh_tw.yml

@@ -1,13 +1,8 @@
 zh_tw:
   calendar:
-     calendar_: 行事曆
+     calendar: 行事曆
-     calendar: 日曆
+     calendars: 我的行事曆
-     categories: 類別
+     color: 顏色
-     color: Color
+     name: 名稱
-     name: Name
+     save: 儲存
-     save: Save
+     select_calendar: 選取行事曆
-     delete: Delete
-     select_calendar: "Select Calendar"
-     create: Create
-     sure?: "Are you sure?"
-     edit: Edit

vendor/built_in_modules/calendar/init.rb

@@ -1,6 +1,6 @@
 module Calendar
   OrbitApp.registration "Calendar",:type=> 'ModuleApp' do
-    module_label 'calendar.calendar_'
+    module_label 'calendar.calendar'
     base_url File.expand_path File.dirname(__FILE__)    
     # personal_plugin :enable => true,:path=>"panel/calendar/plugin/profile",:i18n=>'admin.calendar'
     
@@ -11,14 +11,14 @@ module Calendar
     update_info 'some update_info'
     
     side_bar do
-      head_label_i18n  'calendar.calendar_',:icon_class=>"icons-calendar"
+      head_label_i18n  'calendar.calendar',:icon_class=>"icons-calendar"
       available_for [:admin,:guest,:manager,:sub_manager]
       active_for_controllers ({:private=>['cals','calendar_categories'],:public=>['panel/calendar/back_end/tags']})
       
 
       head_link_path "panel_calendar_back_end_cals_path"
 
-      context_link 'calendar.categories',
+      context_link 'categories',
                             :link_path=>"new_panel_calendar_back_end_cal_path" ,
                             :priority=>1,
                             :active_for_action=>{:cals=>:new},

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb

@@ -91,7 +91,7 @@
 
     <% if is_admin? %>
     <!-- #TODO or類別屬於他 -->
-    <%= link_to (content_tag(:i,I18n.t("gallery.edit"),:class=>"icon-pencil icon-white")),edit_panel_gallery_back_end_album_path(@album),:class=>"bt-edit btn btn-primary pull-right",:title=>I18n.t("gallery.edit")%>
+    <%= link_to (content_tag(:i,I18n.t(:edit),:class=>"icon-pencil icon-white")),edit_panel_gallery_back_end_album_path(@album),:class=>"bt-edit btn btn-primary pull-right",:title=>I18n.t(:edit)%>
     <%= link_to (content_tag(:i,I18n.t("gallery.photo_tag"),:class=>"icon-pencil icon-white")),'#tags',:class=>"bt-tag btn btn-primary pull-right",:title=>I18n.t("gallery.photo_tag")%>
     <% end %>
 

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb

@@ -5,7 +5,7 @@
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
 	<li><span><%= t('gallery.gallery') %></span><span class="divider">/</span></li>
-	<li class="text-blue"><%= t('gallery.edit') %></li>
+	<li class="text-blue"><%= t(:edit) %></li>
 </ul>
 <ul class="nav nav-tabs">
 	<% @site_valid_locales.each_with_index do |locale, i| %>
@@ -62,7 +62,7 @@
 								<a class="btn rgbtsg bt-cover" onclick="return false;" title="<%= t("gallery.set_cover") %>" href="set_cover" for="<%= image.id %>"><span class="icon-star-empty"></span></a>
 							<% end %>
 							<a class="btn rgbtsg bt-tag" onclick="return false;" title="<%= t("gallery.photo_tag") %>" href="<%= image.id %>"><span class="icon-tags"></span></a>
-							<a class="btn rgbtsg bt-dels" onclick="return false;" title="<%= t("gallery.delete") %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
+							<a class="btn rgbtsg bt-dels" onclick="return false;" title="<%= t(:delete_) %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
 						</div>
 					</div>
 				<% end %>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/new.html.erb

@@ -42,7 +42,7 @@
     </div>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal" id="album_name_close_btn" onclick="return false;"><%= t("gallery.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal" id="album_name_close_btn" onclick="return false;"><%= t(:close) %></a>
     <!-- <a href="#" class="btn btn-primary" id="album_name_save_btn" onclick="return false;"><%#= t("gallery.save_changes") %></a> -->
      <%= f.submit t("gallery.save"), :class=> "btn btn-primary bt-form-save" %>
   </div>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb

@@ -72,7 +72,7 @@
       <%= link_to (content_tag(:i,I18n.t("gallery.del_album"),:class=>"icon-trash icon-white")),'delete',:title=> I18n.t("gallery.del_album") ,:class=>"bt-del btn btn-primary pull-right",:onclick=>"return false;" if is_admin?%>
       <!-- #TODO 或是類別屬於他  -->
 
-      <%= link_to (content_tag(:i,I18n.t("gallery.edit"),:class=>"icon-plus icon-white")),edit_panel_gallery_back_end_album_path(@album),:title=> I18n.t("gallery.edit") ,:class=>"bt-edit btn btn-primary pull-right" if is_admin?%>
+      <%= link_to (content_tag(:i,I18n.t(:edit),:class=>"icon-plus icon-white")),edit_panel_gallery_back_end_album_path(@album),:title=> I18n.t(:edit) ,:class=>"bt-edit btn btn-primary pull-right" if is_admin?%>
       <!-- #TODO 或是類別屬於他  -->
 
 

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/gallery_categories/_category.html.erb

@@ -6,8 +6,8 @@
        	<% end %>
       </div>
       <div class="action">
-        <%= link_to(t("gallery.delete"), panel_gallery_back_end_gallery_category_path(category), :method => :delete, :confirm => t("gallery.sure?"), :remote => true, :class => "delete") %>
+        <%= link_to(t(:delete_), panel_gallery_back_end_gallery_category_path(category), :method => :delete, :confirm => t("sure?"), :remote => true, :class => "delete") %>
-         <%= link_to(t("gallery.edit"), edit_panel_gallery_back_end_gallery_category_path(category), :remote => true, :class => "edit") %>
+         <%= link_to(t(:edit), edit_panel_gallery_back_end_gallery_category_path(category), :remote => true, :class => "edit") %>
       	<%= show_gallery_category_permission_link(category) %>
       </div>
     </div>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/gallery_categories/edit.html.erb

@@ -6,5 +6,5 @@
     <% end %>
   <% end %>
 <%= f.submit t("gallery.save"), :class=> "btn btn-primary temp_save_btn" %>
-<a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t("gallery.cancel") %></a>
+<a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t(:cancel) %></a>
 <% end %> 

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/add_album.html.erb

@@ -28,7 +28,7 @@
     </div>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal" id="album_name_close_btn" onclick="return false;"><%= t("gallery.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal" id="album_name_close_btn" onclick="return false;"><%= t(:close) %></a>
     <a href="#" class="btn btn-primary" id="album_name_save_btn" onclick="return false;"><%= t("gallery.save_changes") %></a>
   </div>
 </div>

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/categorylist.html.erb

@@ -8,8 +8,8 @@
        	<% end %>
       </div>
       <div class="action">
-      	<a href="<%= category.id %>" class='delete' onclick='return false;'><%= t("gallery.delete") %></a>
+      	<a href="<%= category.id %>" class='delete' onclick='return false;'><%= t(:delete_) %></a>
-      	<a href="<%= category.id %>" class='edit' onclick='return false;'><%= t("gallery.edit") %></a>
+      	<a href="<%= category.id %>" class='edit' onclick='return false;'><%= t(:edit) %></a>
       	<%= show_gallery_category_permission_link(category) %>
       </div>
     </div>
@@ -45,7 +45,7 @@
 				}
 				tempdom.append("<label>"+lang[locale] + " :</label><input type='text' id='temp_name_"+locale+"' value='"+$(this).text()+"' />");
 			})
-			tempdom.append('<br /><a href="#" class="btn btn-primary" id="temp_save_btn" onclick="return false;"><%= I18n.t("gallery.save") %></a> <a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t("gallery.cancel") %></a>');
+			tempdom.append('<br /><a href="#" class="btn btn-primary" id="temp_save_btn" onclick="return false;"><%= I18n.t("gallery.save") %></a> <a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t(:cancel) %></a>');
 			tempdom.find("a#temp_cancel_btn").click(function(){
 				parent.html(parenthtml);
 				parent.find("div.action a.delete").click(function(){
@@ -73,7 +73,7 @@
         
         $.post("gallery_category_save",{"category":lang},function(response){
           if(response.success){
-          	var $dom = $('<div class="tag clear hide"><div class="tagitem"><i class="icons-star"></i>'+lang.en+' '+lang.zh_tw+'</div> <div class="action"><a href="'+response.id+'" class="delete" onclick="return false;"><%= I18n.t("gallery.delete") %></a></div></div>');
+          	var $dom = $('<div class="tag clear hide"><div class="tagitem"><i class="icons-star"></i>'+lang.en+' '+lang.zh_tw+'</div> <div class="action"><a href="'+response.id+'" class="delete" onclick="return false;"><%= I18n.t(:delete_) %></a></div></div>');
             $("div#tags").append($dom);
             $dom.show('slide');
             $dom.find("a.delete").click(function(){

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/edit_album.html.erb

@@ -1,7 +1,7 @@
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
 	<li><span><%= t('gallery.gallery') %></span><span class="divider">/</span></li>
-	<li class="text-blue"><%= t('gallery.edit') %></li>
+	<li class="text-blue"><%= t(:edit) %></li>
 </ul>
 <ul class="nav nav-tabs">
 	<% @site_valid_locales.each_with_index do |locale, i| %>
@@ -36,7 +36,7 @@
 								<a class="btn rgbtsg bt-cover" onclick="return false;" title="<%= t("gallery.set_cover") %>" href="<%= image.id %>"><span class="icon-star-empty"></span></a>
 							<% end %>
 							<a class="btn rgbtsg bt-tag" onclick="return false;" title="<%= t("gallery.photo_tag") %>" href="<%= image.id %>"><span class="icon-tags"></span></a>
-							<a class="btn rgbtsg bt-dels" onclick="return false;" title="<%= t("gallery.delete") %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
+							<a class="btn rgbtsg bt-dels" onclick="return false;" title="<%= t(:delete_) %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
 						</div>
 					</div>
 				<% end %>

vendor/built_in_modules/gallery/config/locales/en.yml

@@ -1,38 +1,37 @@
 en:
+
   gallery:
-    gallery: Gallery 
-    album_name: Album Name
-    album_tag: Album Tag
-    photo_tag: Photo Tag
-    all: All
-    select_category: "--Select a category--"
-    manage_categories: Manage Categories
-    categories: Categories
-    new_category: New Category
-    save_changes: Save Changes
-    close: Close
-    delete: Delete
-    english: English
-    chinese: Chinese
-    album_desc: Album Desc
     add_album: Add Album
-    back_to_photos: Back to Photos
-    back_to_albums: Back to Albums
     add_images: Add Images
-    del_album: Delete Album
+    album: Album
-    edit: Edit
+    album_desc: Album Description
-    delete_selected: Delete Selected
+    album_name: Album Name
-    del_album?:  "Delete this album?"
+    album_not_found: Album Not Found
-    album_not_found: "Album not found"
+    album_tag: Album Tag
-    pic_not_found: "Picture not found"
+    back_to_albums: Back to Albums
-    save: Save
+    back_to_photos: Back to Photos
     cate_auth: Category Authorization
-    cancel: Cancel
+    chinese: Chinese
+    cover: Cover
+    del_album: Delete Album
+    del_album?: Delete this album?
+    delete_selected: Delete Selected
+    english: English
+    frontend:
+      albums: Front-end albums
+    gallery: Gallery
+    manage_categories: Manage Category
+    new_category: New Category
+    no_description: No Decription
+    photo_tag: Photo Tag
+    pic_not_found: Picture Not Found
+    save: Save
+    save_changes: Save Changes
     search_tags: Search Tags
-    cover: Album Cover
+    select_category: Select Category
-    set_cover: Set as Album Cover
+    set_cover: Set as Cover
-    sure?: "Are you sure?"
+    widget:
-    no_description: Description Unavailable
+      widget1: Widget1
     widget_option:
-       horizontal: Horizontal Pictures
+      horizontal: Horizontal
-       vertical: Vertical  Pictures
+      vertical: Vertical

vendor/built_in_modules/gallery/config/locales/zh_tw.yml

@@ -1,43 +1,37 @@
 zh_tw:
+
   gallery:
-    gallery: 相簿
+    add_album: 新增相冊
-    album_name: 相簿名稱
+    add_images: 新增影像
-    album_tag: 相簿標籤
+    album: 相冊
-    photo_tag: 照片標籤
+    album_desc: 相冊描述
-    all: 全部
+    album_name: 相冊名稱
-    select_category: 選擇類別
+    album_not_found: 找不到相冊
-    manage_categories: 類別管理
+    album_tag: 相冊標籤
-    categories: 類別
+    back_to_albums: 回到相冊
-    new_category: 新類別
+    back_to_photos: 回到相片
-    save_changes: 儲存變更
+    cate_auth: 類別授權
-    close: 關閉
-    delete: 刪除
-    english: 英文
     chinese: 中文
-    album_desc: 相簿描述
-    add_album: 新增相簿
-    back_to_photos: 回到照片
-    back_to_albums: 回到相簿
-    add_images: 新增照片
-    del_album: 刪除相簿
-    edit: 編輯
-    delete_selected: 刪除選擇項目
-    del_album?:  "要刪除這本相簿嗎？"
-    front_end:
-      albums: 相簿前台
-    album_not_found: 找不到此相簿
-    pic_not_found: 找不到該照片
-    save: 儲存
-    cate_auth: 類別權限
-    cancel: 取消
-    search_tags: 搜尋標籤
     cover: 封面
-    set_cover: 設為封面
+    del_album: 刪除相冊
-    sure?: "你確定嗎?"
+    del_album?: 要刪除這本相簿嗎？
+    delete_selected: 刪除已選取項目
+    english: 英文
+    frontend:
+      albums: 相簿前台
+    gallery: 相簿
+    manage_categories: 管理類別
+    new_category: 新增類別
     no_description: 沒有描述
+    photo_tag: 相片標籤
+    pic_not_found: 找不到圖片
+    save: 儲存
+    save_changes: 儲存變更
+    search_tags: 搜尋標籤
+    select_category: 選擇類別
+    set_cover: 設定為封面
     widget:
-        widget1: Widget1
+      widget1: Widget1
     widget_option:
-       horizontal: 水平圖片數量     
+      horizontal: 水平
-       vertical: 垂直圖片數量
+      vertical: 垂直
-       album: 相簿

vendor/built_in_modules/gallery/init.rb

@@ -28,14 +28,14 @@ module Gallery
       # tags_query 'GalleryTag.all'
 
       #* customize_widget "albums","gallery.widget.albums",:fields=>[],:style=>[],:options=>{"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6], "album_id"=>{"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}}} 
-      #* customize_widget_options_fields_i18n({"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.widget_option.album"}} )
+      #* customize_widget_options_fields_i18n({"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.album"}} )
 
       customize_widget "widget1" do 
         widget_i18n "gallery.widget.widget1"
         style []
         options "vertical",:i18n => "gallery.widget_option.vertical",:options_item=>[1, 2]
         options "horizontal",:i18n => "gallery.widget_option.horizontal",:options_item=>[1, 2,3,4,5,6]
-        options "album_id",:i18n =>"gallery.widget_option.album",:options_item => {"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}
+        options "album_id",:i18n =>"gallery.album",:options_item => {"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}
       end
 
     end
@@ -48,7 +48,7 @@ module Gallery
 
       head_link_path "panel_gallery_back_end_albums_path"
       
-      context_link 'gallery.categories',
+      context_link 'categories',
                             :link_path=>"panel_gallery_back_end_gallery_categories_path" ,
                             :priority=>3,
                             :active_for_action=>{:gallery_categories=>:index},

vendor/built_in_modules/page_content/config/locales/en.yml

@@ -4,4 +4,6 @@ en:
     context: Page content
     create_page_content_success: Page content was successfully created
     editing_page_content: Editing page content
+    frontend:
+      page: Front-end page
     update_page_content_success: Page content was successfully updated

vendor/built_in_modules/page_content/config/locales/zh_tw.yml

@@ -1,9 +1,9 @@
 zh_tw:
 
   page_content:
-    context: 頁面內容
+    context: 內文
-    create_page_content_success: 頁面內容已成功建立
+    create_page_content_success: 建立頁面內容成功
     editing_page_content: 編輯頁面內容
-    update_page_content_success: 頁面內容已成功更新
     frontend:
       page: 頁面前台
+    update_page_content_success: 更新頁面內容成功

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_book_categorys/_writing_book_category.html.erb

@@ -7,7 +7,7 @@
 					<% if is_admin?%>
 						<li><%= link_to t('writing_book_category.edit'), 
 						polymorphic_path([:panel, :personal_book, :back_end, writing_book_category], {:action => :edit}), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
 					<% end %>
 				</ul>
 			</div>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_author_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_book_back_end_writing_book_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_author_type), 
-			polymorphic_path([:panel, :personal_book, :back_end, list_author_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_book, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_paper_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_book_back_end_writing_book_paper_type_quick_edit_path(list_paper_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_paper_type), 
-			polymorphic_path([:panel, :personal_book, :back_end, list_paper_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_book, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_book/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
   
-  _locale: English
+  module_name:
-  
+    personal_book: Book 
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_book/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
   
-  _locale: 中文
   module_name:
     personal_book: 專書 
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb

@@ -52,7 +52,7 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper
        :href => edit_panel_personal_conference_desktop_conference_page_path(publication),
        "callback-method" => "editpaper",
        "ajax-remote" => "get") + \
-      content_tag(:a, t("delete"),
+      content_tag(:a, t(:delete_),
         "ajax-remote" => "delete",
         "confirm-message" => t("sure?"),
         "callback-method" => "paperDelete",

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb

@@ -7,7 +7,7 @@
 					<% if is_admin?%>
 						<li><%= link_to t('writing_conference_category.edit'), 
 						polymorphic_path([:panel, :personal_conference, :back_end, writing_conference_category], {:action => :edit}), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(writing_conference_category), polymorphic_path([:panel, :personal_conference, :back_end, writing_conference_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+						<li><%= link_to show_toggle_archive_btn(writing_conference_category), polymorphic_path([:panel, :personal_conference, :back_end, writing_conference_category]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
 					<% end %>
 				</ul>
 			</div>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_list_author_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_conference_back_end_writing_conference_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action">編輯</a>
 		<%= link_to show_toggle_archive_btn(list_author_type), 
-			polymorphic_path([:panel, :personal_conference, :back_end, list_author_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_conference, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_list_paper_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_conference_back_end_writing_conference_paper_type_quick_edit_path(list_paper_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action">編輯</a>
 		<%= link_to show_toggle_archive_btn(list_paper_type), 
-			polymorphic_path([:panel, :personal_conference, :back_end, list_paper_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_conference, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb

@@ -4,7 +4,7 @@
     <div class="form_space" id="form_space_<%= i.to_s %>"><%= conference_co_author_relation.relation %></div>
     <div class="list_item_function">
       <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
-      <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
+      <%= link_to t(:delete_), panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
     </div>
     </li>
   <% end %>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb

@@ -19,7 +19,7 @@
               </ul>
               <div class="list_item_function">
                 <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>
-                <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt"  %>
+                <%= link_to t(:delete_), panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt"  %>
               </div>
             </li>
           </ul>

vendor/built_in_modules/personal_conference/config/locales/en.yml

@@ -1,5 +1,8 @@
 en:
-  _locale: "English"
+
+  module_name:
+    personal_conference: Conference
+
   personal_conference:
     year : "Year"
     language : "Language"
@@ -47,5 +50,3 @@ en:
   noResultsText: "No results"
   searchingText: "Searching…"
 
-  error_msg:
-    time_series_illegal: "must be before end time"

vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml

@@ -1,5 +1,5 @@
 zh_tw:
-  _locale: "中文"
+
   module_name:
     personal_conference: 研討會論文
   personal_conference:
@@ -48,5 +48,3 @@ zh_tw:
   noResultsText: "沒有相關的比對結果"
   searchingText: "搜尋中…"
 
-  error_msg:
-    time_series_illegal: "啟始時間必須早於結束時間"

vendor/built_in_modules/personal_diploma/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_diploma: Diploma
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_diploma: 學歷
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experience_categorys/_experience_category.html.erb

@@ -7,7 +7,7 @@
 					<% if is_admin?%>
 						<li><%= link_to t('writing_book_category.edit'), 
 						polymorphic_path([:panel, :personal_book, :back_end, writing_book_category], {:action => :edit}), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
 					<% end %>
 				</ul>
 			</div>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_list_experience_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_experience_back_end_experience_experience_category_quick_edit_path(list_experience_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_experience_type), 
-			polymorphic_path([:panel, :personal_experience, :back_end, list_experience_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_experience, :back_end, list_experience_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_experience/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_experience: Experience
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml

@@ -1,244 +1,5 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_experience: 經歷
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
     

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_list_honor_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_honor_back_end_honor_honor_category_quick_edit_path(list_honor_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_honor_type), 
-			polymorphic_path([:panel, :personal_honor, :back_end, list_honor_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_honor, :back_end, list_honor_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_honor/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_honor: Honor
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_honor: 榮譽
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb

@@ -52,7 +52,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
        :href => edit_panel_personal_journal_desktop_journal_page_path(publication),
        "callback-method" => "editpaper",
        "ajax-remote" => "get") + \
-      content_tag(:a, t("delete"),
+      content_tag(:a, t(:delete_),
         "ajax-remote" => "delete",
         "confirm-message" => t("sure?"),
         "callback-method" => "paperDelete",

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journal_categorys/_writing_journal_category.html.erb

@@ -8,7 +8,7 @@
 						<li><%= link_to t('writing_journal_category.edit'), 
 						polymorphic_path([:panel, :personal_journal, :back_end, writing_journal_category], {:action => :edit}), :remote => true %></li>
 						<li><%= link_to show_toggle_archive_btn(writing_journal_category), 
-						polymorphic_path([:panel, :personal_journal, :back_end, writing_journal_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+						polymorphic_path([:panel, :personal_journal, :back_end, writing_journal_category]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
 					<% end %>
 				</ul>
 			</div>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_author_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_author_type), 
-			polymorphic_path([:panel, :personal_journal, :back_end, list_author_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_journal, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_level_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_level_type_quick_edit_path(list_level_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_level_type), 
-			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_paper_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_paper_type_quick_edit_path(list_paper_type) %>#myModal3" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_paper_type), 
-			polymorphic_path([:panel, :personal_journal, :back_end, list_paper_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_journal, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_tag_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_level_type_quick_edit_path(list_level_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action">編輯</a>
 		<%= link_to show_toggle_archive_btn(list_level_type), 
-			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %>
+			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb

@@ -4,7 +4,7 @@
     <div class="form_space" id="form_space_<%= i.to_s %>"><%= journal_co_author_relation.relation %></div>
     <div class="list_item_function">
       <%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %>
-      <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
+      <%= link_to t(:delete_), panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
     </div>
     </li>
   <% end %>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb

@@ -18,7 +18,7 @@
               </ul>
               <div class="list_item_function">
                 <%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>
-                <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt"  %>
+                <%= link_to t(:delete_), panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt"  %>
               </div>
             </li>
       <% end %>

vendor/built_in_modules/personal_journal/config/locales/en.yml

@@ -1,4 +1,6 @@
 en:
+  module_name:
+    personal_journal: Journal
   personal_journal:
     paper_title : "Paper Title"
     journal_title : "Journal Title"
@@ -43,6 +45,3 @@ en:
   hintText: "Type in a search term"
   noResultsText: "No results"
   searchingText: "Searching…"
-
-  error_msg:
-    time_series_illegal: "must be before end time"

vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml

@@ -45,6 +45,3 @@ zh_tw:
   hintText: "請輸入搜尋關鍵字"
   noResultsText: "沒有相關的比對結果"
   searchingText: "搜尋中…"
-
-  error_msg:
-    time_series_illegal: "啟始時間必須早於結束時間"

vendor/built_in_modules/personal_lab/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_lab: Lab
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_lab: 實驗室
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_book_category.html.erb

@@ -7,7 +7,7 @@
 					<% if is_admin?%>
 						<li><%= link_to t('writing_book_category.edit'), 
 						polymorphic_path([:panel, :personal_book, :back_end, writing_book_category], {:action => :edit}), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
+						<li><%= link_to show_toggle_archive_btn(writing_book_category), polymorphic_path([:panel, :personal_book, :back_end, writing_book_category]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %></li>
 					<% end %>
 				</ul>
 			</div>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_list_patent_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_patent_back_end_writing_patent_writing_patent_category_quick_edit_path(list_patent_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_patent_type), 
-			polymorphic_path([:panel, :personal_patent, :back_end, list_patent_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_patent, :back_end, list_patent_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_patent/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_patent: Patent
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_patent: 專利
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/project_categorys/_project_category.html.erb

@@ -6,7 +6,7 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 					<li><%= link_to t('project_category.edit'), edit_panel_personal_project_back_end_project_category_path(project_category), :remote => true %></li>
-					<li><%= link_to t('project_category.delete'), panel_personal_project_back_end_project_category_path(project_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+					<li><%= link_to t('project_category.delete'), panel_personal_project_back_end_project_category_path(project_category), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 				</ul>
 			</div>
 		</td>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_list_project_type.html.erb

@@ -6,6 +6,6 @@
 		
 		<a href="<%= panel_personal_project_back_end_project_project_category_quick_edit_path(list_project_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
 		<%= link_to show_toggle_archive_btn(list_project_type), 
-			polymorphic_path([:panel, :personal_project, :back_end, list_project_type]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
+			polymorphic_path([:panel, :personal_project, :back_end, list_project_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>

vendor/built_in_modules/personal_project/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_project: Project
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_project/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_project: 研究計畫
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/personal_research/config/locales/en.yml

@@ -1,135 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
 
-  _locale: English
+  module_name:
-  
+    personal_research: Research
-  add: Add
-  back: Back
-  create: Create
-  delete: Delete
-  disable: Disable
-  downloaded: Downloaded
-  download: Download
-  edit: Edit
-  enable: Enable
-  hide: Hide
-  homepage: Homepage
-  no_: "No"
-  nothing: Nothing
-  show: Show
-  sure?: Are you sure?
-  update: Update
-  yes_: "Yes"
-  
-  announcement:
-      sure?: Sure?
-
-
-  web_resource:
-    list_lower: list
-    list_link: Links list
-
-  
-  # admin:
-  #     action: Action
-  #     add_language: Add language
-  #     admin: Admin
-  #     action: Action
-  #     announcement: Announcement
-  #     asset: Asset
-  #     attributes: Attributes
-  #     cant_delete_self: You can not delete yourself.
-  #     cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #     class: Class
-  #     content: Content
-  #     create_error_link: Error when creating link.
-  #     create_error_page: Error when creating page.
-  #     create_success_home: Homepage was successfully created.
-  #     create_success_layout: Layout was successfully created.
-  #     create_success_link: Link was successfully created.
-  #     create_success_page: Page was successfully created.
-  #     create_success_snippet: Snippet was successfully created.
-  #     create_success_user: User was successfully created.
-  #     data: Data
-  #     delete_language: Delete language
-  #     description: Description
-  #     design: Design
-  #     disable_language: Disable language
-  #     editing_home: Editing homepage
-  #     editing_layout: Editing layout
-  #     editing_link: Editing link
-  #     editing_page: Editing page
-  #     editing_snippet: Editing snippet
-  #     editing_user_info: Editing user information
-  #     editing_user_role: Editing user role
-  #     email: Email
-  #     enable_language: Enable language
-  #     file_name: Filename
-  #     file_size: File size
-  #     format: Format
-  #     home: Home
-  #     id: ID
-  #     info: Information
-  #     is_published: Is published
-  #     item: Item
-  #     key: Key
-  #     language: Language
-  #     layout: Layout
-  #     layout_name: Layout name
-  #     list_assets: Assets list
-  #     list_designs: Designs list
-  #     list_items: Items list
-  #     list_puchases: Purchases list
-  #     list_snippets: Snippets list
-  #     list_users: Users list
-  #     list_user_infos: User information list
-  #     list_user_roles: User roles list
-  #     member: Member
-  #     move_down: Move down
-  #     move_up: Move up
-  #     multilingual: Multilingual
-  #     my_avatar: My Avatar
-  #     no_home_page: You don't have a homepage
-  #     no_layout: You don't have a layout
-  #     name: Name
-  #     new_asset: New asset
-  #     new_component: New component
-  #     new_home: New homepage
-  #     new_layout: New layout
-  #     new_link: New link
-  #     new_page: New page
-  #     new_snippet: New snippet
-  #     new_user: New user
-  #     new_user_info: New user information
-  #     new_user_role: New user role
-  #     non_multilingual: Non multilingual
-  #     options: Options
-  #     orig_upload_file: Original filename
-  #     position: Position
-  #     published?: Published?
-  #     purchase: Purchase
-  #     registered: Registered
-  #     role: Role
-  #     roles: Roles
-  #     title: Title
-  #     translation: Translation
-  #     type: Type
-  #     up_to_date: Up-to-date
-  #     update_error_link: Error when updating link.
-  #     update_error_page: Error when updating page.
-  #     update_success_content: Content was successfully updated.
-  #     update_success_home: Homepage was successfully updated.
-  #     update_success_layout: Layout was successfully updated.
-  #     update_success_link: Link was successfully updated.
-  #     update_success_page: Page was successfully updated.
-  #     update_success_snippet: Snippet was successfully updated.
-  #     update_success_user: User was successfully updated.
-  #     url: URL
-  #     user: User
-  #     user_info: User information
-  #     user_panel: User panel
-  #     user_role: User role
-    
-  panel:

vendor/built_in_modules/personal_research/config/locales/zh_tw.yml

@@ -1,244 +1,4 @@
 zh_tw:
 
-  _locale: 中文
   module_name:
     personal_research: 研究
-  add: 新增
-  back: 回去
-  create: 創造
-  delete: 刪除
-  disable: 禁用
-  edit: 編輯
-  enable: 啟用
-  hide: 隱藏
-  homepage: 首頁
-  no_: "No"
-  nothing: 無
-  show: 顯示
-  sure?: 您肯定嗎?
-  update: 更新
-  yes_: "Yes"
-  
-  web_resource:
-    list_lower: 列表
-    list_link: 鏈接列表
-    category: 分類
-    name: 名稱
-    describe: 描述
-    url: 路徑
-    edit: 編輯
-    delete: 刪除
-    cate_auth: 分類授權
-    
-    
-# Chinese (Taiwan) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 %{count} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "%{count} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 %{count} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "%{count} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 %{count} 小時"
-      x_days:
-        one: "一天"
-        other: "%{count} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 %{count} 個月"
-      x_months:
-        one: "一個月"
-        other: "%{count} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 %{count} 年"
-      over_x_years:
-        one: "一年多"
-        other: "%{count} 年多"
-      almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      decimal_units:
-        format: "%n %u"
-        units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "微" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
-          unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
-          thousand: "千" # 10^3 kilo
-          million: "百萬" # 10^6 mega
-          billion: "十億" # 10^9 giga
-          trillion: "兆" # 10^12 tera
-          quadrillion: "千兆" # 10^15 peta
-          # 10^18 exa, 10^21 zetta, 10^24 yotta
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-    select:
-      prompt: "請選擇"
-
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      inclusion: "沒有包含在列表中"
-      exclusion: "是被保留的關鍵字"
-      invalid: "是無效的"
-      confirmation: "不符合確認值"
-      accepted: "必須是可被接受的"
-      empty: "不能留空"
-      blank: "不能是空白字元"
-      too_long: "過長（最長是 %{count} 個字）"
-      too_short: "過短（最短是 %{count} 個字）"
-      wrong_length: "字數錯誤（必須是 %{count} 個字）"
-      not_a_number: "不是數字"
-      not_an_integer: "必須是整數"
-      greater_than: "必須大於 %{count}"
-      greater_than_or_equal_to: "必須大於或等於 %{count}"
-      equal_to: "必須等於 %{count}"
-      less_than: "必須小於 %{count}"
-      less_than_or_equal_to: "必須小於或等於 %{count}"
-      odd: "必須是奇數"
-      even: "必須是偶數"
-    template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
-  helpers:
-    select:
-      prompt: "請選擇"
-    submit:
-      create: "新增%{model}"
-      update: "更新%{model}"
-      submit: "儲存%{model}"
- 

vendor/built_in_modules/web_resource/init.rb

@@ -40,7 +40,7 @@ module WebResource
                             :active_for_action=>{:web_links=>:index},
                             :available_for => [:all]
 
-      context_link 'link', 
+      context_link 'add', 
                             :link_path=>"new_panel_web_resource_back_end_web_link_path" ,
                             :priority=>2,
                             :active_for_action=>{:web_links=>:new},