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

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-04-24 16:45:13 +08:00
parent db46803cda d0ced39c74
commit a47ef5cfe8
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vendor/built_in_modules/announcement/config/locales/en.yml vendored
View File

@ -46,6 +46,15 @@ en:
clear: Clear
hot: Hot
top: Top
hidden: Hidden
passed: Approved
pending: Pending
rejected: Rejected
clear: Clear
announcement:
all_articles: List
add_new: Add