From 765c9fd6e8c53280dfb31874e4af95ba09fe4112 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Thu, 22 Aug 2013 22:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8D=E8=AF=A5=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb | 6 +++---
 config/locales/en.yml           | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 354e3f996..50dc818ef 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -20,7 +20,7 @@
 <div id="query_form_content" class="hide-when-print">
 	<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
 		<legend onclick="toggleFieldset(this);">
-			<%= l(:label_filter_plural) %>
+			<%= l(:label_issue_query_condition) %>
 		</legend>
 		<div style="<%= @query.new_record? ? "" : "display: none;" %>">
 			<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
@@ -54,8 +54,8 @@
 </div>
 <p class="buttons hide-when-print">
 
-	<%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-	<%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
+	<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+	<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
 </p>
 <% end %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 061518066..28aa8c4d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1314,5 +1314,6 @@ en:
   label_sort_by_active: sorting by active
   label_sort_by_influence: sorting by influence
   label_bids_published: published
-  label_bids_published_ago: ago  label_welcome_trustie: Trustie forge
+  label_bids_published_ago: ago  
+  label_welcome_trustie: Trustie forge
   label_welcome_trustie_description: a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.