From e12a5400618eced0643eace8668d22cade177580 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Wed, 13 Aug 2014 17:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A5=E5=8E=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/zh.yml |  2 +-
 db/schema.rb          | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 62a5649a3..b60184665 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1039,7 +1039,7 @@ zh:
   button_ok_and_submit: 确定并提交
 
   button_apply: 查询
-  button_clear: 清除留言
+  button_clear: 取消查询
   button_clear_requirement: 取消
   button_lock: 锁定
   button_unlock: 解锁
diff --git a/db/schema.rb b/db/schema.rb
index 7a921754a..cdedc6a2c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140811022947) do
+ActiveRecord::Schema.define(:version => 20140812065417) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -291,6 +291,24 @@ ActiveRecord::Schema.define(:version => 20140811022947) do
     t.datetime "updated_on",                  :null => false
   end
 
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
   create_table "course_infos", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
@@ -889,6 +907,19 @@ ActiveRecord::Schema.define(:version => 20140811022947) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1