Merge branch 'ad_banner' into ldap

config/locales/en.yml

@@ -65,6 +65,7 @@ en:
     add_drop_down_item: +Add Menu Item
     admin: Admin
     action: Action
+    all_articles: List
     announcement: Announcement
     asset: Asset
     assets:
@@ -92,7 +93,7 @@ en:
     dashboard: Dashboard
     delete_language: Delete language
     description: Description
-    design: Design
+    design: Template
     disable_language: Disable language
     editing_home: Editing homepage
     editing_layout: Editing layout
@@ -117,6 +118,7 @@ en:
     layout: Layout
     layout_name: Layout name
     links: Links
+    link: Links
     list_assets: Assets list
     list_designs: Designs list
     list_items: Items list
@@ -161,7 +163,7 @@ en:
     setup_translations: Translations setup
     setup_designs: Designs setup
     site: Site
-    site_setting: Site Setting
+    site_settings: Site Setting
     super_pages: Super pages
     structure: Structure
     title: Title

config/locales/zh_tw.yml

@@ -61,6 +61,7 @@ zh_tw:
     add_language: 新增語言
     add_drop_down_item: ＋增加Orbit選單
     admin: 管理
+    all_articles: 列表
     announcement: 公告管理
     asset: 資產
     assets:
@@ -92,7 +93,7 @@ zh_tw:
     data: 資料數據
     delete_language: 刪除語言
     description: 描述
-    design:  網站版型
+    design:  版型管理
     disable_language: 禁用語言
     edit: 編輯
     editing_home: 編輯首頁
@@ -117,6 +118,7 @@ zh_tw:
     language: 語言
     layout: 佈局
     layout_name: 佈局名字
+    link: 連結管理
     links: 網路資源
     list_assets: 資產列表
     list_designs: 設計列表
@@ -151,13 +153,13 @@ zh_tw:
     non_multilingual: 非多種語言
     options: 選項
     orig_upload_file: 原上傳檔名
-    page: Page
+    page: 頁面管理
     position: 位置
     published?: 發布?
     purchase: 購買
     role: 角色
     roles: 角色
-    site_setting: 基本設定
+    site_settings: 基本設定
     setup_member: 成員設置
     setup_translations: 語系設定
     setup_designs: 版型設定