Merge remote branch 'upstream/master'

2 files changed, 39 insertions, 35 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/reviews/project_reviews.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/reviews/project_reviews.html.erb
index 84a76981c3b..2d89c60c43e 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/reviews/project_reviews.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/reviews/project_reviews.html.erb
@@ -1,31 +1,33 @@
-<% 
-  if has_role?(:user, @project)
-    limit = widget_properties["numberOfLines"].to_i == 0 ? 5 : widget_properties["numberOfLines"].to_i
-    
-    if @dashboard_configuration.selected_period?
-      from_date = @dashboard_configuration.from_datetime
-      to_date = DateTime.now
-    end
+<%
+   if has_role?(:user, @project)
+     limit = widget_properties["numberOfLines"].to_i == 0 ? 5 : widget_properties["numberOfLines"].to_i
+
+     from_date=nil
+     to_date=nil
+     if @dashboard_configuration.selected_period?
+       from_date = @dashboard_configuration.from_datetime
+       to_date = DateTime.now
+     end
 %>
 
-<div class="line-block">
-  <div style="float:right">
-    <a href="<%= url_for :controller => 'reviews', :action => 'index', :projects => [@project.id], 
-                         :assignee_login => '', :from => from_date, :to => to_date -%>">
-      <%= message('widgets.more') -%>
-    </a>
+  <div class="line-block">
+    <div style="float:right">
+      <a href="<%= url_for :controller => 'reviews', :action => 'index', :projects => [@project.id],
+                           :assignee_login => '', :from => from_date, :to => to_date -%>">
+        <%= message('widgets.more') -%>
+      </a>
+    </div>
+    <h3><%= message('widget.project_reviews.name') -%></h3>
   </div>
-  <h3><%= message('widget.project_reviews.name') -%></h3>
-</div>
 
-<div id="reviews-widget-<%= widget.id -%>">
-  <%= render :partial => 'project/widgets/reviews/reviews_list', 
-             :locals => {:assignee_login => '', 
-                         :project_key => @project.key,
-                         :statuses => 'OPEN,REOPENED',
-                         :resolution => '',
-                         :limit => limit,
-                         :widget_id => widget.id.to_s} %>
-</div>
+  <div id="reviews-widget-<%= widget.id -%>">
+    <%= render :partial => 'project/widgets/reviews/reviews_list',
+               :locals => {:assignee_login => '',
+                           :project_key => @project.key,
+                           :statuses => 'OPEN,REOPENED',
+                           :resolution => '',
+                           :limit => limit,
+                           :widget_id => widget.id.to_s} %>
+  </div>
 
 <% end %>
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 77a288cd0ab..27f39d567fc 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -12,7 +12,6 @@ alerts=Alerts
 all=All
 and=And
 any=Any
-assign=Assign
 assignee=Assignee
 author=Author
 ascending=Ascending
@@ -90,11 +89,8 @@ plugin=Plugin
 project=Project
 projects=Projects
 raw=Raw
-reassign=Reassign
-reopen=Reopen
 reopened=Reopened
 reset_verb=Reset
-resolve=Resolve
 resolved=Resolved
 result=Result
 results=Results
@@ -147,7 +143,6 @@ version=Version
 #------------------------------------------------------------------------------
 
 activate_all=Activate all
-add_comment=Add comment
 add_a_column=Add a column
 added_over_x_days=Added over {0} days
 added_since=Added since {0}
@@ -208,7 +203,6 @@ since_previous_analysis_detailed=since previous analysis ({0})
 since_version=since version {0}
 since_version_detailed=since version {0} ({1})
 time_changes=Time changes
-update_comment=Update comment
 
 
 #------------------------------------------------------------------------------
@@ -375,10 +369,10 @@ filters.col.key=Key
 #------------------------------------------------------------------------------
 
 reviews.review_number=Review #{0}
-reviews.do_you_want_to_reopen=Do you want to reopen this review?
-reviews.do_you_want_to_resolve=Do you want to resolve this review?
-reviews.flag_as_false_positive=Flag as false-positive
-reviews.unflag_as_false_positive=Unflag as false-positive
+reviews.flag_as_false_positive=False-positive
+reviews.unflag_as_false_positive=Not false-positive
+reviews.flag_as_false_positive_submit=False-positive
+reviews.unflag_as_false_positive_submit=Not false-positive
 reviews.do_you_want_to_delete_comment=Do you want to delete this comment?
 reviews.only_false_positives=Only false positives
 reviews.without_false_positives=Without false positives
@@ -388,8 +382,16 @@ reviews.why_false_positive=Why is it a false-positive ?
 reviews.why_not_false_positive=Why is it not a false-positive anymore ?
 reviews.user_does_not_exist=\ : user does not exist. \\nPlease select a valid user or leave the field blank.
 reviews.change_severity=Change severity
+reviews.comment=Comment
+reviews.comment_submit=Comment
+reviews.update_comment_submit=Update
 reviews.new_severity_label=New severity:
 reviews.change_severity_submit=Change severity
+reviews.assign=Assign
+reviews.assign_submit=Assign
+reviews.assign_to_me_submit=Assign to me
+reviews.resolve=Resolve
+reviews.reopen=Reopen
 
 #------------------------------------------------------------------------------
 #