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

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="bulletin_category-<%=bulletin_category.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("announcement.bulletin.approval_user_list") %></h3>
+    <h3><%= t("announcement.bulletin.submit_user_list") %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">
@@ -41,4 +41,4 @@
 
 
 
-<% end -%>
+<% end -%>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/setting.html.erb

@@ -19,7 +19,7 @@
 
         </li>
     </ul>
-		<%= link_to t("announcement.bulletin.approval_user_list"), panel_announcement_back_end_bulletin_category_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t("announcement.bulletin.submit_user_list"), panel_announcement_back_end_bulletin_category_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
 <%#= label_tag :role, t("admin.roles") %>
@@ -53,4 +53,4 @@ $(document).ready(function() {
 		});
 	});
 });
-</script>
+</script>

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -68,6 +68,7 @@ en:
     related_links: Related Links
     list_announcement: List Announcement
     bulletin:
+      submit_user_list: Submit User
       category: Category
       list_lower: " list"
       title: Title

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -50,6 +50,7 @@ zh_tw:
     list_announcement: 公告列表
     bulletin:
       category: 分類
+      submit_user_list: 張貼人
       list_lower: 列表
       title: 標題
       postdate: 張貼日期
@@ -173,7 +174,9 @@ zh_tw:
     
   panel:
     
-    
+  bulletin_category:
+    edit: 修改
+    delete: 刪除  
     
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="bulletin_category-<%=bulletin_category.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("announcement.bulletin.approval_user_list") %></h3>
+    <h3><%= t("announcement.bulletin.submit_user_list") %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">
@@ -41,4 +41,4 @@
 
 
 
-<% end -%>
+<% end -%>

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb

@@ -19,7 +19,7 @@
 
         </li>
     </ul>
-		<%= link_to t("announcement.bulletin.approval_user_list"), panel_news_back_end_news_bulletin_category_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t("announcement.bulletin.submit_user_list"), panel_news_back_end_news_bulletin_category_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
 <%#= label_tag :role, t("admin.roles") %>
@@ -53,4 +53,4 @@ $(document).ready(function() {
 		});
 	});
 });
-</script>
+</script>