developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap 

Conflicts:
	config/locales/zh_tw.yml
This commit is contained in:
Christophe Vilayphiou 2012-04-30 08:26:07 +08:00
parent 767e4a3fe9 8a99086802
commit 088cd54b1d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@ -27,7 +27,6 @@ en:
homepage: Homepage homepage: Homepage
login: Login login: Login
logout: Logout logout: Logout
news: News
no_: "No" no_: "No"
nothing: Nothing nothing: Nothing
nccu: NCCU nccu: NCCU
@ -176,6 +175,7 @@ en:
new_user: New user new_user: New user
new_info: New user information new_info: New user information
new_role: New user role new_role: New user role
news: News
non_multilingual: Non multilingual non_multilingual: Non multilingual
options: Options options: Options
orig_upload_file: Original filename orig_upload_file: Original filename

2
config/locales/zh_tw.yml
View File

@ -27,7 +27,6 @@ zh_tw:
nccu: 政大 nccu: 政大
nccu_c: nccu_c:
nccu_ldap_uid: 政大LDAP帳號 nccu_ldap_uid: 政大LDAP帳號
news: 新聞
no_: "No" no_: "No"
nothing: 無 nothing: 無
or_lower: 或 or_lower: 或
@ -177,6 +176,7 @@ zh_tw:
new_user: 新增使用 new_user: 新增使用
new_info: 新增用戶資料 new_info: 新增用戶資料
new_role: 新增用戶身份 new_role: 新增用戶身份
news: 新聞
non_multilingual: 非多種語言 non_multilingual: 非多種語言
options: 選項 options: 選項
orig_upload_file: 原上傳檔名 orig_upload_file: 原上傳檔名