Merge branch 'design_team' into ldap

Conflicts: config/locales/zh_tw.yml
2012-04-30 08:11:40 +08:00 · 2012-04-30 08:11:40 +08:00 · 0f203274a7
parent 20504b2205 39410267e8
commit 0f203274a7
2 changed files with 2 additions and 0 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -27,6 +27,7 @@ en:
  homepage: Homepage
  login: Login
  logout: Logout
+  news: News
  no_: "No"
  nothing: Nothing
  nccu: NCCU
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@ -27,6 +27,7 @@ zh_tw:
  nccu: 政大
  nccu_c:
    nccu_ldap_uid: 政大LDAP帳號
+  news: 新聞
  no_: "No"
  nothing: 無
  or_lower: 或