Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509

Conflicts: config/locales/zh_tw.yml
2012-05-14 12:36:09 +08:00
commit 2cd67356a5
@@ -204,6 +204,10 @@ en:
    options: Options
    orig_upload_file: Original filename
    page: Page
+    page_part_kinds:
+      text: Text Area
+      public_r_tag: System Widget
+      module_widget: Plug-in Module Widget
    position: Position
    published?: Published?
    purchase: Purchase
@@ -203,6 +203,10 @@ zh_tw:
      edit: 編輯
      ob_auth:
        edit: 分類授權
+    page_part_kinds:
+      text: 文字區塊
+      public_r_tag: 系統模塊
+      module_widget: 外掛模塊
    position: 位置
    published?: 發布?
    purchase: 購買