merged 1.1 branch into head

[mir.git] / bundles / admin_en.properties

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 4ee9973..fcb18d1 100755 (executable)
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -1,4 +1,6 @@
-# $Id: admin_en.properties,v 1.50 2004/11/06 17:39:45 idfx Exp $
+########## admin ##########
+# language: english
+# $Id: admin_en.properties,v 1.51 2007/04/08 21:46:36 idfx Exp $
 
 languagename=English
 
@@ -69,7 +71,7 @@ media.is_published=published
 media.icon=icon
 media.nr_of_media=Number of Media Items (max 20)
 media.nr_of_media.submit=define number
-media.comments=Comments 
+media.comments=Comments
 media.articles=Articles
 
 medialist.search_text_in=Search text in
@@ -118,7 +120,7 @@ comment.url=Url
 comment.creator=Author
 comment.article=Article
 comment.html=HTML
-comment.status=Status 
+comment.status=Status
 comment.language=Language
 comment.allcomments=All comments
 comment.comment=Internal Comment
@@ -126,6 +128,7 @@ comment.comment.info=(internal)
 
 comment.operation.hide=hide
 comment.operation.unhide=unhide
+comment.operation.delete=delete
 
 
 #commentlist
@@ -231,9 +234,12 @@ content.selectparent=select
 content.operation.hide=hide
 content.operation.unhide=unhide
 content.operation.newswire=newswire
+content.operation.delete=delete
+
 
 content.preview.default = Preview
 
+contentsearch.topic = Topic
 contentsearch.value = search
 contentsearch.field = field
 contentsearch.field.title = Title
@@ -478,40 +484,53 @@ abuse.articleaction=Action for blocked article
 abuse.commentaction=Action for blocked comment
 
 abuse.showlog=Show the IP log
-abuse.showfilters=Manage filters
+abuse.showfiltergroups=Manage filter groups
+abuse.showfilterconfiguration=Manage filter configuration
 
 abuse.log.time=Time
 abuse.log.address=IP number
 abuse.log.object=Object
 abuse.log.browser=Browser
-abuse.log.filtertype=Filter type
-abuse.log.filterexpression=Expression
+abuse.log.filtertag = Filter tag
 
 abuse.filters = Filters
-abuse.filters.movedown = down
-abuse.filters.moveup = up
-abuse.filters.movebottom = bottom
-abuse.filters.movetop = top
-
-abuse.filter.type = Type
-abuse.filter.expression = Expression
-abuse.filter.articleaction = Article 
-abuse.filter.commentaction = Comment 
-abuse.filter.comments = Comments (internal usage)
-abuse.filter.lasthit = Last hit
-abuse.filter.htmltitle = Edit filter
-
-abuse.filtertype.ip = IP Number
-abuse.filtertype.regexp = Regular expression
-abuse.filtertype.useragent= User Agent
-abuse.filtertype.throttle = Throttle
-abuse.filtertype.hostname = Host name
-
-abuse.filtererror.title = Error:
-abuse.filtererror.invalidtype = Invalid filter type
-abuse.filtererror.invalidexpression = Invalid expression for this type
-
-abuse.filters.htmltitle = Anti-abuse filter rules
+filters.movedown = down
+filters.moveup = up
+filters.movebottom = bottom
+filters.movetop = top
+
+filter.type = Type
+filter.expression = Expression
+filter.articleaction = Article
+filter.commentaction = Comment
+filter.comment = Comments (internal usage)
+filter.last_hit = Last hit
+filter.htmltitle = Edit filter
+filter.tag = tag
+
+filtertype.ip = IP Number
+filtertype.regexp = Regular expression
+filtertype.useragent= User Agent
+filtertype.throttle = Throttle
+filtertype.hostname = Host name
+filtertype.size= Posting size
+filtertype.urlblacklist = URL Blacklist query
+
+filtererror.title = Error:
+filtererror.invalidtype = Invalid filter type
+filtererror.invalidexpression = Invalid expression for this type
+
+filterlist.htmltitle = Filter rules
+
+filtergroup.name = Name
+filtergroup.moveup = up
+filtergroup.movedown = down
+filtergroup.listfilters = filters
+filtergroup.delete = delete
+filtergrouplist.htmltitle = Filter groups
+
+
+
 abuse.log.htmltitle = Anti-abuse open posting log
 
 # head