padrino-admin 0.12.2 → 0.12.3

data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt

@@ -20,7 +20,7 @@
           <ul class="nav navbar-nav pull-right">
             <li class=navbar-edit-account><%%= link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link' %></li>
             <li class=navbar-logout>
-              <%%= button_to(:logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') { content_tag :button, tag_icon(:off), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } %>
+              <%%= button_to(:logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') { content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } %>
             </li>
           </ul>
 
@@ -59,6 +59,6 @@
       </div>
     </footer>
 
-    <%%= javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
+    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
   </body>
 </html>

data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt

@@ -39,6 +39,6 @@
       </div>
       <div class="login-footer modal-footer"><%%= submit_tag(pat('login.sign_in'), :class => "btn btn-primary pull-right") %></div>
     <%% end %>
-    <%%= javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
+    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
   </body>
 </html>

data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt

@@ -13,14 +13,14 @@
             </a>
             <ul class="list-menu dropdown-menu" role=menu>
               <li class=ist-menu-wrapper>
-                <%%= link_to tag_icon(:check, pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link' %>
+                <%%= link_to tag_icon('check-square-o', pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link' %>
               </li>
               <li class=list-menu-wrapper.list-menu-wrapper-disabled>
-                <%%= link_to tag_icon('check-empty', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled' %>
+                <%%= link_to tag_icon('square-o', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled' %>
               </li>
               <li class="list-menu-divider divider"></li>
               <li class=list-menu-wrapper.list-menu-wrapper-disabled>
-                <%%=link_to tag_icon(:trash, pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled' %>
+                <%%=link_to tag_icon('trash-o', pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled' %>
                 <div class='list-menu-popover-delete-selected popover right'>
                   <div class=arrow></div>
                   <h3 class=popover-title><%%= pat(:delete_selected_title) %></h3>
@@ -60,7 +60,7 @@
           <td class="list-column list-row-action">
             <div class='list-row-action-wrapper'>
                <%%= link_to tag_icon(:edit), :href => url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :rel => :tooltip, :title => "#{pat(:edit)} <%= @orm.name_singular %>", :class => 'list-row-action-wrapper-link' %>
-               <%%= link_to tag_icon(:trash), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link' %>
+               <%%= link_to tag_icon('trash-o'), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link' %>
                <div class="popover list-row-action-popover-delete-one left">
                  <div class=arrow> </div>
                  <h3 class=popover-title><%%= pat(:delete, :model => "<%= @orm.name_singular %>") %></h3>
@@ -75,4 +75,4 @@
       <%% end %>
     </tbody>
   </table>
-</div>
+</div>

data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt

@@ -5,8 +5,8 @@
 
 .base-icons
   .btn-group
-    .btn.btn-primary{:title => "Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest"}=tag_icon("cogs icon-2x", "Orm Agnostic")
-    .btn.btn-success{:title => "User Authentication Support, User Authorization Management"}=tag_icon("group icon-2x", "Authentication")
-    .btn.btn-info{:title => "Erb, Haml, Slim Rendering Support"}=tag_icon("tasks icon-2x", "Template Agnostic")
-    .btn.btn-warning{:title => "English, German, Russian, Danish, French, Brazilian and Italian localizations and many more!.."}=tag_icon("flag icon-2x", "Multi Language")
-    .btn.btn-danger{:title => "You can create a new 'admin interface' by providing a single Model"}=tag_icon("magic icon-2x", "Scaffold")
+    .btn.btn-primary{:title => "Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest"}=tag_icon("cogs fa-2x", "Orm Agnostic")
+    .btn.btn-success{:title => "User Authentication Support, User Authorization Management"}=tag_icon("group fa-2x", "Authentication")
+    .btn.btn-info{:title => "Erb, Haml, Slim Rendering Support"}=tag_icon("tasks fa-2x", "Template Agnostic")
+    .btn.btn-warning{:title => "English, German, Russian, Danish, French, Brazilian and Italian localizations and many more!.."}=tag_icon("flag fa-2x", "Multi Language")
+    .btn.btn-danger{:title => "You can create a new 'admin interface' by providing a single Model"}=tag_icon("magic fa-2x", "Scaffold")

data/lib/padrino-admin/generators/templates/haml/app/errors/403.haml.tt

@@ -1,3 +1,3 @@
-%p=tag_icon 'minus-sign icon-3x'
+%p=tag_icon 'minus-circle fa-3x'
 %h1=pat('custom_errors.403.title')
 %p=pat('custom_errors.403.description')

data/lib/padrino-admin/generators/templates/haml/app/errors/404.haml.tt

@@ -1,3 +1,3 @@
-%p=tag_icon 'warning-sign icon-3x'
+%p=tag_icon 'exclamation-triangle fa-3x'
 %h1=pat('custom_errors.404.title')
 %p=pat('custom_errors.404.description')

data/lib/padrino-admin/generators/templates/haml/app/errors/500.haml.tt

@@ -1,3 +1,3 @@
-%p=tag_icon 'beaker icon-3x'
+%p=tag_icon 'flask fa-3x'
 %h1=pat('custom_errors.500.title')
 %p=pat('custom_errors.500.description')

data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt

@@ -21,7 +21,7 @@
             %li.navbar-edit-account=link_to tag_icon(:user), url(:accounts, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
             %li.navbar-logout
               =button_to :logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form' do
-                =content_tag :button, tag_icon(:off), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+                =content_tag :button, tag_icon('power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
 
           %ul.nav.navbar-nav.pull-left
             - project_modules.each do |project_module|
@@ -46,4 +46,4 @@
           %li= link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', :target => :_blank, :class => 'footer-links-link'
           %li= link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', :target => :_blank, :class => 'footer-links-link'
 
-    =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    =javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt

@@ -34,4 +34,5 @@
       .login-footer.modal-footer
         = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
 
-        = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+        =javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+

data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt

@@ -12,12 +12,12 @@
               =tag_icon :magic
               %span.caret
             %ul.list-menu.dropdown-menu{:role => :menu}
-              %li.list-menu-wrapper=link_to tag_icon(:check, pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
+              %li.list-menu-wrapper=link_to tag_icon('check-square-o', pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
               %li.list-menu-wrapper.list-menu-wrapper-disabled
-                =link_to tag_icon(:'check-empty', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
+                =link_to tag_icon('square-o', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
               %li.list-menu-divider.divider
               %li.list-menu-wrapper.list-menu-wrapper-disabled
-                =link_to tag_icon(:trash, pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
+                =link_to tag_icon('trash-o', pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
                 .list-menu-popover-delete-selected.popover.right
                   .arrow
                   %h3.popover-title=pat(:delete_selected_title)
@@ -48,7 +48,7 @@
           %td.list-column.list-row-action
             .list-row-action-wrapper
               =link_to tag_icon(:edit), :href => url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :rel => :tooltip, :title => "#{pat(:edit)} <%= @orm.name_singular %>", :class => 'list-row-action-wrapper-link'
-              =link_to tag_icon(:trash), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
+              =link_to tag_icon('trash-o'), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
               .popover.list-row-action-popover-delete-one.left
                 .arrow
                 %h3.popover-title=pat(:delete, :model => "<%= @orm.name_singular %>")

data/lib/padrino-admin/generators/templates/slim/app/base/index.slim.tt

@@ -5,8 +5,8 @@ div class="base-text"
 
 div class="base-icons"
   div class="btn-group"
-    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest" = tag_icon("cogs icon-2x", "Orm Agnostic")
-    div class="btn btn-success" title="User Authentication Support, User Authorization Management" = tag_icon("group icon-2x", "Authentication")
-    div class="btn btn-info" title="Erb, Haml, Slim Rendering Support" = tag_icon("tasks icon-2x", "Template Agnostic")
-    div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations" = tag_icon("flag icon-2x", "Multi Language")
-    div class="btn btn-danger" title="You can create a new 'admin interface' by providing a single Model" = tag_icon("magic icon-2x", "Scaffold")
+    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest" = tag_icon("cogs fa-2x", "Orm Agnostic")
+    div class="btn btn-success" title="User Authentication Support, User Authorization Management" = tag_icon("group fa-2x", "Authentication")
+    div class="btn btn-info" title="Erb, Haml, Slim Rendering Support" = tag_icon("tasks fa-2x", "Template Agnostic")
+    div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations" = tag_icon("flag fa-2x", "Multi Language")
+    div class="btn btn-danger" title="You can create a new 'admin interface' by providing a single Model" = tag_icon("magic fa-2x", "Scaffold")

data/lib/padrino-admin/generators/templates/slim/app/errors/403.slim.tt

@@ -1,3 +1,3 @@
-p = tag_icon 'minus-sign icon-3x'
+p = tag_icon 'minus-circle fa-3x'
 h1 = pat('custom_errors.403.title')
 p = pat('custom_errors.403.description')

data/lib/padrino-admin/generators/templates/slim/app/errors/404.slim.tt

@@ -1,3 +1,3 @@
-p= tag_icon 'warning-sign icon-3x'
+p= tag_icon 'exclamation-triangle fa-3x'
 h1= pat('custom_errors.404.title')
 p= pat('custom_errors.404.description')

data/lib/padrino-admin/generators/templates/slim/app/errors/500.slim.tt

@@ -1,3 +1,3 @@
-p = tag_icon 'beaker icon-3x'
+p = tag_icon 'flask fa-3x'
 h1 = pat('custom_errors.500.title')
 p = pat('custom_errors.500.description')

data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -21,7 +21,7 @@ html lang='en'
           ul class='nav navbar-nav pull-right'
             li class='navbar-edit-account' = link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
             li class='navbar-logout' = button_to(pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') do
-              = content_tag :button, tag_icon(:off), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+              = content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
 
           ul class='nav navbar-nav pull-left'
             - project_modules.each do |project_module|
@@ -45,4 +45,4 @@ html lang='en'
           li = link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', :target => :_blank, :class => 'footer-links-link'
           li = link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', :target => :_blank, :class => 'footer-links-link'
 
-    =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    =javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt

@@ -34,4 +34,4 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
 
         div class="login-footer modal-footer"
           = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
-    = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    = javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/slim/page/index.slim.tt

@@ -12,11 +12,11 @@ div class="tabs-content"
               = tag_icon :magic
               span class='caret'
             ul class='list-menu dropdown-menu' role='dropdown'
-              li class='list-menu-wrapper' = link_to tag_icon(:check, pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
-              li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('check-empty', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
+              li class='list-menu-wrapper' = link_to tag_icon('check-square-o', pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
+              li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('square-o', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
               li class='list-menu-divider divider'
               li class='list-menu-wrapper list-menu-wrapper-disabled'
-                = link_to tag_icon(:trash, pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
+                = link_to tag_icon('trash-o', pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
                 div class='list-menu-popover-delete-selected popover right'
                   div class='arrow'
                   h3 class='popover-title' = pat(:delete_selected_title)
@@ -46,7 +46,7 @@ div class="tabs-content"
           td class='list-column list-row-action'
             div class='list-row-action-wrapper'
               = link_to tag_icon(:edit), :href => url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :rel => :tooltip, :title => "#{pat(:edit)} <%= @orm.name_singular %>", :class => 'list-row-action-wrapper-link'
-              = link_to tag_icon(:trash), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
+              = link_to tag_icon('trash-o'), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
               div class='popover list-row-action-popover-delete-one left'
                 div class='arrow'
                 h3 class='popover-title' = pat(:delete, :model => "<%= @orm.name_singular %>")

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -17,7 +17,7 @@ module Padrino
         #   tag_icon(:edit, :list)
         #
         def tag_icon(icon, tag = nil)
-          content = content_tag(:i, '', :class=> "icon-#{icon}")
+          content = content_tag(:i, '', :class=> "fa fa-#{icon}")
           content << " #{tag}"
         end
 

data/lib/padrino-admin/locale/admin/zh_tw.yml

@@ -2,55 +2,55 @@ zh_tw:
   padrino:
     admin:
       login:
-        title: "註冊"
+        title: "登入"
         email: "電子郵件"
         password: "密碼"
-        bypass: "旁路登錄?"
-        sign_in: "登錄"
+        bypass: "直接登入管理後台？"
+        sign_in: "登入系統"
         error: "電子郵件或密碼錯誤."
-      save: "保存"
-      save_and_continue: "保存並繼續"
+      save: "儲存"
+      save_and_continue: "儲存並繼續"
       cancel: "取消"
-      list: "名單"
+      list: "清單"
       edit: "編輯"
-      new: "新"
-      show: "秀"
+      new: "新增"
+      show: "顯示"
       delete: "刪除"
-      confirm: "你確定嗎？"
+      confirm: "確定？"
       created_at: "建立於"
       all: "全部"
       profile: "編輯個人資料"
       settings: "設置"
-      logout: "退出管理"
+      logout: "登出"
       select_all: "全選"
-      deselect_all: "全選"
+      deselect_all: "取消全選"
       delete_selected: "刪除所選"
       delete_selected_title: "你確定你要刪除所有選定的項目嗎？"
-      example: "例如：一個簡單的文本"
+      example: "例如：普通說明文字"
       new_title: "新的 %{model}"
       create_title: "編輯 %{model}"
       create_success: "%{model} 已成功創建。"
       create_error: "無法創建 %{model}"
       edit_title: "編輯 %{model}"
-      edit_warning: "找不到 ID 的 %{id} %{model}"
+      edit_warning: "找不到 ID 為 %{id} 的 %{model}"
       update_title: "編輯 %{model}"
-      update_success: "ID %{id} 的 %{model} l已成功更新。"
+      update_success: "ID 為 %{id} 的 %{model} 已成功更新。"
       update_error: "無法更新 %{model}"
-      update_warning: "找不到 ID %{id} 的 %{model}"
+      update_warning: "找不到 ID 為 %{id} 的 %{model}"
       delete_title: "刪除 %{model}？"
-      delete_success: "ID %{id} 的 %{model} 被成功刪除。"
+      delete_success: "ID 為 %{id} 的 %{model} 被成功刪除。"
       delete_error: "無法刪除 %{model}！"
-      delete_warning: "找不到ID%的 %{id} %{model}"
-      destroy_many_error: "您必須選擇至少1 %{model} 刪除"
-      destroy_many_success: "%{model} %{ids} 已成功刪除。"
+      delete_warning: "找不到 ID 為 %{id} 的 %{model}"
+      destroy_many_error: "您必須選擇至少一個 %{model}，才可刪除"
+      destroy_many_success: "%{model} %{ids} 已全部刪除。"
       custom_errors:
         title: "錯誤"
         '403':
           title: "錯誤 403"
-          description: "被禁止"
+          description: "拒絕/禁止存取"
         '404':
           title: "錯誤 404"
-          description: "未找到"
+          description: "找不到該網頁"
         '500':
           title: "錯誤 500"
-          description: "服務器錯誤"
+          description: "伺服器錯誤"

data/lib/padrino-admin/locale/orm/cs.yml

@@ -1,29 +1,4 @@
 cs:
-  activemodel: &activemodel
-    errors:
-      messages:
-        inclusion: "není v seznamu povolených hodnot"
-        exclusion: "je vyhrazeno pro jiný účel"
-        invalid: "není platná hodnota"
-        confirmation: "nebylo potvrzeno"
-        accepted: "musí být potvrzeno"
-        empty: "nesmí být prázdný/é"
-        blank: "je povinná položka"
-        too_long: "je příliš dlouhá/ý (max. %{count} znaků)"
-        too_short: "je příliš krátký/á (min. %{count} znaků)"
-        wrong_length: "nemá správnou délku (očekáváno %{count} znaků)"
-        taken: "již databáze obsahuje"
-        not_a_number: "není číslo"
-        greater_than: "musí být větší než %{count}"
-        greater_than_or_equal_to: "musí být větší nebo rovno %{count}"
-        equal_to: "musí být rovno %{count}"
-        less_than: "musí být méně než %{count}"
-        less_than_or_equal_to: "musí být méně nebo rovno %{count}"
-        odd: "musí být liché číslo"
-        even: "musí být sudé číslo"
-        record_invalid: "Následující pole obsahují chybně vyplněné údaje: %{errors}"
-        content_type: "nepodporovaný formát souboru"
-  #activerecord: *activemodel
   ohm:
     errors:
       messages:

data/lib/padrino-admin/locale/orm/da.yml

@@ -1,29 +1,4 @@
 da:
-  activemodel: &activemodel
-    errors:
-      messages:
-        inclusion: "findes ikke i listen"
-        exclusion: "er reserveret"
-        invalid: "er ikke gyldig"
-        confirmation: "matcher ikke gentagelse"
-        accepted: "skal accepteres"
-        empty: "må ikke være tom"
-        blank: "må ikke være blank"
-        too_long: "er for lang (maksimum er %{count} tegn)"
-        too_short: "er for kort (minimum er %{count} tegn)"
-        wrong_length: "har ikke den rigtige længde (skal være på %{count} tegn)"
-        taken: "er allerede i brug"
-        not_a_number: "er ikke et tal"
-        greater_than: "skal være større end %{count}"
-        greater_than_or_equal_to: "skal være større end eller lig %{count}"
-        equal_to: "skal være lig %{count}"
-        less_than: "skal være mindre end %{count}"
-        less_than_or_equal_to: "skal være mindre end eller lig %{count}"
-        odd: "skal være ulige"
-        even: "skal være lige"
-        record_invalid: "Valideringsfejl: %{errors}"
-        content_type: "fileformatet er ikke understøttet"
-  activerecord: *activemodel
   ohm:
     errors:
       messages:

data/lib/padrino-admin/locale/orm/de.yml

@@ -1,29 +1,4 @@
 de:
-  activemodel: &activemodel
-    errors:
-      messages:
-        inclusion: "ist nicht in der Liste enthalten"
-        exclusion: "ist reserviert"
-        invalid: "ist ungültig"
-        confirmation: "entspricht nicht der Bestätigung"
-        accepted: "muss akzeptiert werden"
-        empty: "Darf nicht leer sein"
-        blank: "Darf nicht nur Leerzeichen enthalten"
-        too_long: "ist zu lang (Maximum ist %{count} Zeichen)"
-        too_short: "ist zu kurz (Minimum ist %{count} Zeichen)"
-        wrong_length: "hat eine ungültige Länge (soll %{count} Zeichen sein)"
-        taken: "ist schon vergeben"
-        not_a_number: "ist keine Nummer"
-        greater_than: "muss größer als %{count} sein"
-        greater_than_or_equal_to: "muss größer oder gleich %{count} sein"
-        equal_to: "muss gleich %{count} sein"
-        less_than: "muss weniger als %{count} sein"
-        less_than_or_equal_to: "muss weniger oder gleich %{count} sein"
-        odd: "muss ungerade sein"
-        even: "muss gerade sein"
-        record_invalid: "Validierung schlug fehl: %{errors}"
-        content_type: "Datei-Format wird nicht unterstützt"
-  activerecord: *activemodel
   ohm:
     errors:
       messages:

data/lib/padrino-admin/locale/orm/en.yml

@@ -1,29 +1,4 @@
 en:
-  activemodel: &activemodel
-    errors:
-      messages:
-        inclusion: "is not included in the list"
-        exclusion: "is reserved"
-        invalid: "is invalid"
-        confirmation: "doesn't match confirmation"
-        accepted: "must be accepted"
-        empty: "can't be empty"
-        blank: "can't be blank"
-        too_long: "is too long (maximum is %{count} characters)"
-        too_short: "is too short (minimum is %{count} characters)"
-        wrong_length: "is the wrong length (should be %{count} characters)"
-        taken: "has already been taken"
-        not_a_number: "is not a number"
-        greater_than: "must be greater than %{count}"
-        greater_than_or_equal_to: "must be greater than or equal to %{count}"
-        equal_to: "must be equal to %{count}"
-        less_than: "must be less than %{count}"
-        less_than_or_equal_to: "must be less than or equal to %{count}"
-        odd: "must be odd"
-        even: "must be even"
-        record_invalid: "Validation failed: %{errors}"
-        content_type: "file format not supported"
-  activerecord: *activemodel
   ohm:
     errors:
       messages:

data/lib/padrino-admin/locale/orm/es.yml

@@ -1,29 +1,4 @@
 es:
-  activemodel: &activemodel
-    errors:
-      messages:
-        inclusion: "no está incluido en la lista"
-        exclusion: "está reservado"
-        invalid: "es inválido"
-        confirmation: "no es igual a la confirmación"
-        accepted: "debe ser aceptado"
-        empty: "no puede estar vacío"
-        blank: "no puede estar en blanco"
-        too_long: "es demasiado largo (máximo %{count} caracteres)"
-        too_short: "es demasiado corto (minimo %{count} caracteres)"
-        wrong_length: "tiene una longitud incorrecta (debería tener %{count} caracteres)"
-        taken: "ya está tomado"
-        not_a_number: "no es un número"
-        greater_than: "debe ser mayor a %{count}"
-        greater_than_or_equal_to: "debe ser igual o mayor a %{count}"
-        equal_to: "debe ser igual a %{count}"
-        less_than: "debe ser menor a %{count}"
-        less_than_or_equal_to: "debe ser igual o menor a %{count}"
-        odd: "debe ser impar"
-        even: "debe ser par"
-        record_invalid: "Fallo la validación: %{errors}"
-        content_type: "formato de archivo no soportado"
-  activerecord: *activemodel
   ohm:
     errors:
       messages: