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:11:40 +08:00
parent 20504b2205 39410267e8
commit 0f203274a7
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -27,6 +27,7 @@ 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

1
config/locales/zh_tw.yml
View File

@ -27,6 +27,7 @@ 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: 或