diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 4d44158a4..f4e4b6559 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -18,9 +18,9 @@
 class NewsController < ApplicationController
   default_search_scope :news
   model_object News
-  before_filter :find_model_object, :except => [:new, :index, :preview]
-  before_filter :find_project_from_association, :except => [:new, :index, :preview]
-  before_filter :find_project, :only => [:new, :preview]
+  before_filter :find_model_object, :except => [:new, :create, :index, :preview]
+  before_filter :find_project_from_association, :except => [:new, :create, :index, :preview]
+  before_filter :find_project, :only => [:new, :create, :preview]
   before_filter :authorize, :except => [:index, :preview]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
@@ -46,11 +46,17 @@ class NewsController < ApplicationController
 
   def new
     @news = News.new(:project => @project, :author => User.current)
+  end
+
+  def create
+    @news = News.new(:project => @project, :author => User.current)
     if request.post?
       @news.attributes = params[:news]
       if @news.save
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'news', :action => 'index', :project_id => @project
+      else
+        render :action => 'new'
       end
     end
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eecbc5b91..6ba40eb45 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -829,7 +829,7 @@ module ApplicationHelper
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
-      options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default})
+      options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default})
       email = nil
       if user.respond_to?(:mail)
         email = user.mail
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2b7362589..c49952306 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -382,6 +382,11 @@ class Issue < ActiveRecord::Base
     done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor
     return done_date <= Date.today
   end
+
+  # Does this issue have children?
+  def children?
+    !leaf?
+  end
   
   # Users the issue can be assigned to
   def assignable_users
diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml
index c5d17511a..30c63ec66 100644
--- a/app/views/issues/_action_menu.rhtml
+++ b/app/views/issues/_action_menu.rhtml
@@ -6,5 +6,5 @@
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), new_issue_move_path(:id => @issue, :copy_options => {:copy => 't'}), :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), new_issue_move_path(:id => @issue), :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
 </div>
diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml
index 4be566e0b..04d64df1f 100644
--- a/app/views/news/edit.rhtml
+++ b/app/views/news/edit.rhtml
@@ -12,3 +12,7 @@
                    }, :accesskey => accesskey(:preview) %>
 <% end %>
 <div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 8b7cc66e1..2b53b7f72 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -7,7 +7,7 @@
 
 <div id="add-news" style="display:none;">
 <h2><%=l(:label_news_new)%></h2>
-<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
                                            :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
@@ -45,6 +45,7 @@
 
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
 <% end %>
 
 <% html_title(l(:label_news_plural)) -%>
diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
index a4d29a0a9..74ae64ae8 100644
--- a/app/views/news/new.rhtml
+++ b/app/views/news/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_news_new)%></h2>
 
-<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'create', :project_id => @project },
                                            :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 79de5984b..6b2b09d0f 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -1,5 +1,6 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %>
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 0a8c427ef..e99da7062 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -909,3 +909,5 @@ bg:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 741f46232..bef17900e 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -929,3 +929,5 @@ bs:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 50a389156..38092a2a7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -918,3 +918,5 @@ ca:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 96fb608b6..d3cdae5ef 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -915,3 +915,5 @@ cs:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 38d9d6646..25d288336 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -931,3 +931,5 @@ da:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5ec7073b3..f9847c3f5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -803,6 +803,7 @@ de:
   button_create_and_continue: Anlegen + nächstes Ticket
   button_test: Testen
   button_edit: Bearbeiten
+  button_edit_associated_wikipage: "Zugehörige Wikiseite bearbeiten: {{page_title}}"
   button_add: Hinzufügen
   button_change: Wechseln
   button_apply: Anwenden
@@ -934,3 +935,4 @@ de:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 22bc6a459..2b6e3493d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -915,3 +915,5 @@ el:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8c0b28cf3..4f5aec111 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -919,3 +919,5 @@ en-GB:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cc4e31185..2930d8079 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -786,6 +786,7 @@ en:
   button_create_and_continue: Create and continue
   button_test: Test
   button_edit: Edit
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   button_add: Add
   button_change: Change
   button_apply: Apply
@@ -837,6 +838,7 @@ en:
   text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
   text_workflow_edit: Select a role and a tracker to edit the workflow
   text_are_you_sure: Are you sure ?
+  text_are_you_sure_with_children: "Delete issue and all child issues?"
   text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
   text_journal_set_to: "{{label}} set to {{value}}"
   text_journal_deleted: "{{label}} deleted ({{old}})"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3f848f1d1..18d56ae3e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -955,3 +955,5 @@ es:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 24ef38ea7..983fe1482 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -919,3 +919,5 @@ eu:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 985ab8b2a..ea14a5c0d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -940,3 +940,5 @@ fi:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7f96b6112..0654ee736 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -933,3 +933,5 @@ fr:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b717d8d60..5360095f6 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -931,3 +931,5 @@ gl:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 86ebe7d3a..0129eff88 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -920,3 +920,5 @@ he:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f4a809a9a..9219ac660 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -922,3 +922,5 @@ hr:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index fe1abdf36..e099cb9bc 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -938,3 +938,5 @@
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 7c327833f..185d4f21d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -923,3 +923,5 @@ id:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8d5aa4ef4..be0da6a48 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -919,3 +919,5 @@ it:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 09eb36690..2ea6b009f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -940,3 +940,5 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index eea667d62..e4dc36fb6 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -971,3 +971,5 @@ ko:
   project_module_calendar: 달력
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b12a1107b..40e58b980 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -979,3 +979,5 @@ lt:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 271140cce..6162f60ef 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -910,3 +910,5 @@ lv:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index c98761865..fb2f78d29 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -915,3 +915,5 @@ mk:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index b92538a47..5358657eb 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -916,3 +916,5 @@ mn:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e13e67ddf..071b3919e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -897,3 +897,5 @@ nl:
   project_module_calendar: Kalender
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/no.yml b/config/locales/no.yml
index cc95dae7d..4b76683fc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -906,3 +906,5 @@
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6621ad39e..b56fd71eb 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -936,3 +936,5 @@ pl:
   project_module_calendar: Kalendarz
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 547074083..ee1aefac5 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -939,3 +939,5 @@ pt-BR:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 28822061a..cb336e25a 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -923,3 +923,5 @@ pt:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 85fea1399..2e8f7a1ca 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -908,3 +908,5 @@ ro:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 806b5c0ac..08e1acb95 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -230,6 +230,7 @@ ru:
   button_delete: Удалить
   button_download: Загрузить
   button_edit: Редактировать
+  button_edit_associated_wikipage: "Редактировать связанную wiki-страницу: {{page_title}}"
   button_list: Список
   button_lock: Заблокировать
   button_login: Вход
@@ -1032,3 +1033,4 @@ ru:
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
 
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3fd6c41b2..37c5ea6b1 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -910,3 +910,5 @@ sk:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 68d8bb089..6732ef98d 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -911,3 +911,5 @@ sl:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index c2ac531c9..d73fd0340 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -915,3 +915,5 @@ sr-YU:
   project_module_calendar: Kalendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 5b5dfd461..1b6a8d334 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -916,3 +916,5 @@ sr:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
 
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8055c572d..439f9c7cd 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -960,3 +960,5 @@ sv:
   enumeration_system_activity: Systemaktivitet
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3e855995f..bc936f709 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -912,3 +912,5 @@ th:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 43871ffe9..4b0e6022c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -938,3 +938,5 @@ tr:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 89901d1ea..146454da4 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -911,3 +911,5 @@ uk:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 28351ed26..8cf978d09 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -970,3 +970,5 @@ vi:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8dab78787..38efcfa9d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -366,6 +366,7 @@
   field_redirect_existing_links: 重新導向現有連結
   field_estimated_hours: 預估工時
   field_column_names: 欄位
+  field_time_entries: 耗用工時
   field_time_zone: 時區
   field_searchable: 可用做搜尋條件
   field_default_value: 預設值
@@ -378,8 +379,9 @@
   field_group_by: 結果分組方式
   field_sharing: 共用
   field_parent_issue: 父工作項目
-  field_time_entries: 耗用工時
-    
+  field_member_of_group: 所屬群組
+  field_assigned_to_role: 所屬角色
+  
   setting_app_title: 標題
   setting_app_subtitle: 副標題
   setting_welcome_text: 歡迎詞
@@ -870,6 +872,7 @@
   button_create_and_continue: 繼續建立
   button_test: 測試
   button_edit: 編輯
+  button_edit_associated_wikipage: "編輯相關 Wiki 頁面: {{page_title}}"
   button_add: 新增
   button_change: 修改
   button_apply: 套用
@@ -998,5 +1001,5 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
+
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b882d277a..a7611bf1d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -933,3 +933,5 @@ zh:
   project_module_calendar: Calendar
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
diff --git a/config/routes.rb b/config/routes.rb
index 062bb586e..ceaaf6219 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -148,7 +148,7 @@ ActionController::Routing::Routes.draw do |map|
       news_views.connect 'news/:id/edit', :action => 'edit'
     end
     news_routes.with_options do |news_actions|
-      news_actions.connect 'projects/:project_id/news', :action => 'new'
+      news_actions.connect 'projects/:project_id/news', :action => 'create', :conditions => {:method => :post}
       news_actions.connect 'news/:id/edit', :action => 'edit'
       news_actions.connect 'news/:id/destroy', :action => 'destroy'
     end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8acae48a8..946701a8d 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -91,7 +91,7 @@ Redmine::AccessControl.map do |map|
   end
   
   map.project_module :news do |map|
-    map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
+    map.permission :manage_news, {:news => [:new, :create, :edit, :destroy, :destroy_comment]}, :require => :member
     map.permission :view_news, {:news => [:index, :show]}, :public => true
     map.permission :comment_news, {:news => :add_comment}
   end
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 27905b2bb..c4a2c3d90 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -154,7 +154,7 @@ module Redmine
           if query.grouped? && (group = query.group_by_column.value(issue)) != previous_group
             pdf.SetFontStyle('B',9)
             pdf.Cell(277, row_height, 
-              (group.blank? ? 'None' : group.to_s) + " (#{@issue_count_by_group[group]})",
+              (group.blank? ? 'None' : group.to_s) + " (#{query.issue_count_by_group[group]})",
               1, 1, 'L')
             pdf.SetFontStyle('',8)
             previous_group = group
@@ -255,7 +255,7 @@ module Redmine
         pdf.SetFontStyle('B',9)
         pdf.Cell(35,5, l(:field_description) + ":")
         pdf.SetFontStyle('',9)
-        pdf.MultiCell(155,5, @issue.description,"BR")
+        pdf.MultiCell(155,5, issue.description,"BR")
         
         pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
         pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 3abb9a7fb..dd782fa3b 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -65,12 +65,12 @@ class NewsControllerTest < ActionController::TestCase
     assert_template 'new'
   end
   
-  def test_post_new
+  def test_post_create
     ActionMailer::Base.deliveries.clear
     Setting.notified_events << 'news_added'
 
     @request.session[:user_id] = 2
-    post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
+    post :create, :project_id => 1, :news => { :title => 'NewsControllerTest',
                                             :description => 'This is the description',
                                             :summary => '' }
     assert_redirected_to 'projects/ecookbook/news'
@@ -98,9 +98,9 @@ class NewsControllerTest < ActionController::TestCase
     assert_equal 'Description changed by test_post_edit', news.description
   end
 
-  def test_post_new_with_validation_failure
+  def test_post_create_with_validation_failure
     @request.session[:user_id] = 2
-    post :new, :project_id => 1, :news => { :title => '',
+    post :create, :project_id => 1, :news => { :title => '',
                                             :description => 'This is the description',
                                             :summary => '' }
     assert_response :success
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 794a7780e..1fc3f82d4 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -157,7 +157,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
     should_route :get, "/news/234", :controller => 'news', :action => 'show', :id => '234'
 
-    should_route :post, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
+    should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
     should_route :post, "/news/567/edit", :controller => 'news', :action => 'edit', :id => '567'
     should_route :post, "/news/567/destroy", :controller => 'news', :action => 'destroy', :id => '567'
   end
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index f737b2f0c..db6173bae 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -400,7 +400,7 @@ class QueryTest < ActiveSupport::TestCase
                                [group1.name, group1.id],
                                [group2.name, group2.id]
                               ]
-        assert_equal expected_group_list, @query.available_filters["member_of_group"][:values]
+        assert_equal expected_group_list.sort, @query.available_filters["member_of_group"][:values].sort
       end
 
     end