From 2815febe4693e68de4f55b3bfb284cafd0bd203f Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 18 Mar 2010 13:21:53 +0000
Subject: [PATCH] Revert "Fix #662654: As an administrator, I can configure a
 Collection to show recent comments. Rename 'Discussion Item' title from
 'Comment' to 'Discussion Item'."

This reverts commit 25c8faacc11353af815edb9dfdac567c2ddf284d.

Conflicts (solved):

	CHANGES.txt

test and full fix on the way

svn path=/plone.app.discussion/trunk/; revision=35264
---
 CHANGES.txt                                                   | 4 ----
 .../app/discussion/profiles/default/types/Discussion_Item.xml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a081128..c71a26f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,10 +6,6 @@ Changelog
 
 * German translation updated.
   [juh]
-
-* Fix #662654: As an administrator, I can configure a Collection to show recent 
-  comments. Rename 'Discussion Item' title from 'Comment' to 'Discussion Item'
-  [chaoflow]
   
 * Fix #2419342: Fix untranslated published/deleted status messages.
   [timo]
diff --git a/plone/app/discussion/profiles/default/types/Discussion_Item.xml b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
index 4e45721..f5feac0 100644
--- a/plone/app/discussion/profiles/default/types/Discussion_Item.xml
+++ b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <object name="Discussion Item" meta_type="Factory-based Type Information"
    i18n:domain="plone" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Discussion Item</property>
+ <property name="title" i18n:translate="">Comment</property>
  <property name="description" i18n:translate="">Comments added to a content item.</property>
  <property name="content_icon">discussionitem_icon.gif</property>
  <property name="content_meta_type">Discussion Item</property>