chris
parent
d46abd7caf
commit
4709c08ad1
15
Gemfile.lock
15
Gemfile.lock
|
|
@ -81,7 +81,7 @@ GEM
|
|||
ffi (~> 1.0, >= 1.0.11)
|
||||
chinese_pinyin (0.4.1)
|
||||
chronic (0.9.0)
|
||||
coderay (1.0.8)
|
||||
coderay (1.0.9)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
|
|
@ -128,14 +128,13 @@ GEM
|
|||
httpclient (2.3.2)
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.2.1)
|
||||
jquery-rails (2.1.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (4.0.1)
|
||||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
json (1.7.7)
|
||||
libv8 (3.11.8.13)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
|
|
@ -212,7 +211,6 @@ GEM
|
|||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.3)
|
||||
rb-readline (0.4.2)
|
||||
rdoc (3.12.1)
|
||||
json (~> 1.4)
|
||||
redis (3.0.2)
|
||||
|
|
@ -222,7 +220,6 @@ GEM
|
|||
chinese_pinyin (>= 0.3.0)
|
||||
redis (>= 2.1.1)
|
||||
redis-namespace (>= 1.0.2)
|
||||
ref (1.0.2)
|
||||
resque (1.23.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.0)
|
||||
|
|
@ -303,9 +300,6 @@ GEM
|
|||
sunspot (= 1.3.3)
|
||||
sunspot_solr (1.3.3)
|
||||
terminal-table (1.4.5)
|
||||
therubyracer (0.11.3)
|
||||
libv8 (~> 3.11.8.12)
|
||||
ref
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
tinymce-rails (3.5.8)
|
||||
|
|
@ -346,10 +340,9 @@ DEPENDENCIES
|
|||
factory_girl_rails
|
||||
faker
|
||||
impressionist!
|
||||
jquery-rails
|
||||
jquery-rails (= 2.1.4)
|
||||
jquery-ui-rails
|
||||
kaminari!
|
||||
libv8 (~> 3.11.8)
|
||||
mime-types
|
||||
mini_magick
|
||||
mongo_session_store-rails3 (= 3.0.6)
|
||||
|
|
@ -366,7 +359,6 @@ DEPENDENCIES
|
|||
radius
|
||||
rails (~> 3.2.9)
|
||||
rake
|
||||
rb-readline
|
||||
redis (>= 2.1.1)
|
||||
redis-namespace
|
||||
redis-search
|
||||
|
|
@ -387,7 +379,6 @@ DEPENDENCIES
|
|||
sunspot-rails-tester
|
||||
sunspot_mongo
|
||||
sunspot_solr
|
||||
therubyracer
|
||||
tinymce-rails
|
||||
uglifier
|
||||
watchr
|
||||
|
|
|
|||
|
|
@ -38,9 +38,6 @@ zh_tw:
|
|||
widget_info_for_ad_image_size: "此區塊圖片尺寸使用: %{best_size}"
|
||||
ad_banner: 廣告輪播
|
||||
add: 新增
|
||||
<<<<<<< HEAD
|
||||
add_item: 新增項目
|
||||
=======
|
||||
add_attribute_field: 新增欄位
|
||||
add_image: Add image
|
||||
add_item: 新增項目
|
||||
|
|
@ -53,19 +50,14 @@ zh_tw:
|
|||
county: 縣市
|
||||
zip: 郵遞區號
|
||||
country: 國家/地區
|
||||
>>>>>>> a7bc197... member list edit
|
||||
addthis_tools:
|
||||
add_to_bookmark: 加入書籤
|
||||
admin: 管理員
|
||||
all_content: 所有內容
|
||||
all_file: 所有檔案
|
||||
<<<<<<< HEAD
|
||||
all_member: 所有會員
|
||||
=======
|
||||
all_member: 成員列表
|
||||
all_plugin_summary: All plugin summary
|
||||
all_plugins: All plugins
|
||||
>>>>>>> a7bc197... member list edit
|
||||
always_display_title: 永遠顯示標題
|
||||
app_auth:
|
||||
list_setting_result: 授權列表
|
||||
|
|
@ -125,9 +117,6 @@ zh_tw:
|
|||
page: 頁面已成功建立
|
||||
user: 使用者已成功建立
|
||||
create_: 建立
|
||||
<<<<<<< HEAD
|
||||
data: 資料
|
||||
=======
|
||||
cross_lang: 啟用單語系
|
||||
data: 資料
|
||||
date:
|
||||
|
|
@ -143,7 +132,6 @@ zh_tw:
|
|||
month: 月
|
||||
west_calendar: 西元
|
||||
date_: Date
|
||||
>>>>>>> a7bc197... member list edit
|
||||
dashboard:
|
||||
bulletin: 公告
|
||||
news_bulletin: 新聞
|
||||
|
|
@ -211,12 +199,9 @@ zh_tw:
|
|||
file_type: 檔案類型
|
||||
forgot_password: 忘記密碼?
|
||||
frequency: 頻率
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
frontend_data_count: Frontend data count
|
||||
gallery: Gallery
|
||||
groups: 群組
|
||||
>>>>>>> a7bc197... member list edit
|
||||
help: 幫助
|
||||
hidden: 隱藏的
|
||||
hide: 隱藏
|
||||
|
|
@ -225,12 +210,6 @@ zh_tw:
|
|||
horizontal: 水平的
|
||||
hot: 熱門
|
||||
image: 圖片
|
||||
<<<<<<< HEAD
|
||||
info: 信息
|
||||
intro: 簡介
|
||||
is_published: 已發佈
|
||||
item: 項目
|
||||
=======
|
||||
images: Images
|
||||
info: 基本資料
|
||||
initial: 預設值
|
||||
|
|
@ -239,7 +218,6 @@ zh_tw:
|
|||
item: 項目
|
||||
item_name: 名稱
|
||||
javascripts: Javascripts
|
||||
>>>>>>> a7bc197... member list edit
|
||||
key: 索引
|
||||
last_modified: 最後修改者
|
||||
layout: 範本
|
||||
|
|
@ -287,10 +265,6 @@ zh_tw:
|
|||
user_name: 電子郵件帳號
|
||||
manager: 管理者
|
||||
manager: 管理者
|
||||
<<<<<<< HEAD
|
||||
me: 我
|
||||
member: 會員
|
||||
=======
|
||||
markup: 輸入模式
|
||||
markup_options: Markup options
|
||||
markup_value: Markup value
|
||||
|
|
@ -300,7 +274,6 @@ zh_tw:
|
|||
member_info: 基本資料表
|
||||
member_registration: 註冊審核
|
||||
member_role: 身份欄位
|
||||
>>>>>>> a7bc197... member list edit
|
||||
menu_enabled_for: 選單啟用
|
||||
modal:
|
||||
close: 關閉
|
||||
|
|
@ -321,13 +294,9 @@ zh_tw:
|
|||
page: 新增頁面
|
||||
user: 新增使用者
|
||||
info: 新增使用者資訊
|
||||
<<<<<<< HEAD
|
||||
role: 新增使用者角色
|
||||
=======
|
||||
role: 新增身份
|
||||
sub_role: 新增子身份
|
||||
new_: New
|
||||
>>>>>>> a7bc197... member list edit
|
||||
news: 新聞
|
||||
no_: "不是"
|
||||
no_deadline: 沒有期限
|
||||
|
|
@ -352,11 +321,8 @@ zh_tw:
|
|||
password_current: 目前的密碼
|
||||
pending: 待審核
|
||||
picture: 圖片
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
placeholder: 欄位提示文字
|
||||
plugins: Plugins
|
||||
>>>>>>> a7bc197... member list edit
|
||||
postdate: 張貼日期
|
||||
posted_by: 張貼人
|
||||
preview: 預覽
|
||||
|
|
@ -371,15 +337,9 @@ zh_tw:
|
|||
rejected_reason: '拒絕原因:'
|
||||
rejected_reason_empty: "拒絕核准, 沒有參考資訊"
|
||||
related_links: 相關連結
|
||||
<<<<<<< HEAD
|
||||
remember_me: 記住我
|
||||
role: 角色
|
||||
Roles: 角色
|
||||
=======
|
||||
role: 身份
|
||||
role_field: 身份欄位
|
||||
roles: 身份
|
||||
>>>>>>> a7bc197... member list edit
|
||||
ruling_site: 銳綸網站
|
||||
search:
|
||||
domains: Google Search Domains
|
||||
|
|
|
|||
Loading…
Reference in New Issue